commit | 6590929cfa8e43e91989ab652dc5c11d8771cbae | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jan 12 17:40:23 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 12 17:40:23 2017 +0000 |
tree | 06f868993387059067b8f5923d2f02224fde138d | |
parent | 940639f8b31ba9590588326aeb3c9280b5e9036b [diff] | |
parent | 04f8ba7bb7183e1c4ca2ffba8a3b0f31de018b90 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 2f9af2aa69 -s ours am: 04f8ba7bb7 -s ours Change-Id: I4f4317d788bff53bf621b06a6e01498f8497253a