commit | 79d910104a5730a1268cff27ad6870af6648d668 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 09 14:34:29 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 09 14:34:29 2016 +0000 |
tree | f26a9b11a2eca484c290e34eff309d39fd5396c9 | |
parent | 2b0549e5e3f7a0d21dc2dc304bcee53450760098 [diff] | |
parent | 2729e0985727177345a68e7073ed1692d5e51d33 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 972b902171 -s ours am: 2729e09857 -s ours Change-Id: Ib183bb161904472854fb6a4ae65943329d5c21a6