commit | 7556f0bc2c8ff359636068bf90f30e787c4b4cca | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 17 04:48:37 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 17 04:48:37 2016 +0000 |
tree | 71b74f73ee83ead341cd3035de763bd8f1a474db | |
parent | 430ad959853cf053c317ad256b8613e05d29f5fe [diff] | |
parent | b197cd85a6d3b91f9b8e429187dbf8382b064209 [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: b197cd85a6 -s ours Change-Id: I02065195a90cbedb96abafe734cd4d4ce2295022