commit | 74279bd75a2571087a91212b6ce55e63b8229855 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Oct 15 03:55:56 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Oct 15 03:55:56 2018 -0700 |
tree | bff25596cdc8cbd4f10c746d382a98fd49d12159 | |
parent | 97de2735488b425ba6074cd71007b1145fbf3bb4 [diff] | |
parent | a26f5a8ccebf26e995ddfc1e85abada89da8f1a2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: bf1c3119f3 -s ours am: a26f5a8cce -s ours Change-Id: I4312444eee42943fcb68f1e43f82d2b4f997464a