commit | e266de328205fd9cd0116f6c1589e2737738ec55 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 24 06:34:34 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 24 06:34:34 2016 +0000 |
tree | ffee558071687d7aacc08b1921b9b88721c91add | |
parent | bf74f68fd9a85c375182bd17db02a68689001a35 [diff] | |
parent | 1072cc117589d0e6e8e8aaf3f967da00e547d6b9 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 5bb180388a -s ours am: 1072cc1175 -s ours Change-Id: I63a62b20953668ba82cf05387041cfa8b1d2e0bb