commit | 3897ad6e84e034ca8f3b4fffd7f58234016651c1 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jan 05 10:20:58 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 05 10:20:58 2017 +0000 |
tree | 3eb13f6a29123e3726f68152d05f7093c10ebe45 | |
parent | b4e65fde19d97b00681fb18670d413e606a03084 [diff] | |
parent | 2b1a252a5cac765e3bb3f344046855c8a88da6b8 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 20088b3e31 -s ours am: 2b1a252a5c -s ours Change-Id: Id3b30de9325aa23a3c39f355d1eac3976f0637ad