commit | d2cca3f1c4dd82e154cd3975a31a1cde9467953d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 21 03:35:46 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 21 03:35:46 2016 +0000 |
tree | e7d25877386497b36d316ecc084192609bddc6e9 | |
parent | 972e55f47e4078f24d1b4b2c4d8b7029c1e59535 [diff] | |
parent | e5eed9ed611b3fd1e8f5d96bf08fee79323260e0 [diff] |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: e5eed9ed61 -s ours Change-Id: I3da9d4d737f0aaa57aef597dfe30a50cfe576587