commit | ba6a80589e0f1cd3546c9f362e31df7f2b02faf2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Aug 04 18:17:08 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 18:17:08 2018 -0700 |
tree | 8c3db70c6823534b4e3c15948b030a17a5bc04a2 | |
parent | b1a318dbdd99297c8c6142b6b2e097bdc6804909 [diff] | |
parent | 205a2f40babd3eb1dac620d6a5c19e4ee41c511e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9a9aec3313 -s ours am: 205a2f40ba -s ours Change-Id: Id001f3991859b1657cedce9f71257730340371a5