commit | 61e96d5a3c627240eff32ba5c64ef5a6094a51a9 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Sep 29 07:41:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 29 07:41:27 2016 +0000 |
tree | 8f813e61865806b5a6fa03b932074c2ebe238e6a | |
parent | b8790f77bedb07cc24967769fd60877ee0565955 [diff] | |
parent | 0b076441a2165dbfeeb624e10743f0906c3fbebc [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8e44108cf1 -s ours am: 0b076441a2 -s ours Change-Id: Ie7e1cd97a519177a7fdfe9d6a634365f39d2bb5e