commit | 7863bdc39dc3774aa190a512dc82fec032f27df2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Nov 05 07:24:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Nov 05 07:24:31 2016 +0000 |
tree | 7f787643d9fa8365b543dbf24ba2b7734295833e | |
parent | 0640144963f0ea68c1434724ad23688f22467f4d [diff] | |
parent | e4dd76c1fe9b7e383fede4f1d138c40a1e44de80 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50725a97a0 -s ours am: e4dd76c1fe -s ours Change-Id: Iaf431883b44066af15b314a521bf72a5fb863039