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