commit | f604fec47fa5296ecc88b6f87cd78b63e47f20c6 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 03 18:51:48 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 03 18:51:48 2016 +0000 |
tree | db123fc3f028d65464b0d1fdbf59207786dc3aa0 | |
parent | a8420151b6a46cf0a74f9bacc878cea93179755d [diff] | |
parent | 1f914332aa056c6902d3f8dda7025422ed38958b [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours am: cc44ccf2f9 -s ours am: 1f914332aa -s ours * commit '1f914332aa056c6902d3f8dda7025422ed38958b': Change-Id: I9744fb39f54d9770c103f919499c90bae95e4544