tree eb0adaa80148da6be6f8de46200adba834f46adb
parent 705a4d72c87fa0da3dfc7c9413810523b8382b0b
parent 474dc18479280459406c82fd190a7a0af8b0c532
author Bill Yi <byi@google.com> 1491105617 +0000
committer android-build-merger <android-build-merger@google.com> 1491105617 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 474dc18479  -s ours

Change-Id: I173829304cd93380fb3dedfd43d8b4774686d8a9