commit | 4d6ff7e6693477c17e7985178ce273e14fd954da | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Oct 06 21:00:03 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 06 21:00:03 2016 +0000 |
tree | 3c7ab21919bf9e534e76874f51052f10e416e59d | |
parent | b30d988a1cf13f7bd0853d6de39337f72616efba [diff] | |
parent | f0be222981651edacb8a547cefdb7efaf0746854 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9 -s ours am: f0be222981 -s ours Change-Id: I22381a4a7bc572765718c6003769431b0974567c