commit | eb946a56a26d9f9edaf1b365828ba738cd6613b8 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 24 06:02:26 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 24 06:02:26 2016 +0000 |
tree | caff9980a3e2b4cc17374050ebbd17fd91838b9e | |
parent | 13821d8aed5f0079d5af54f7e8518679faa7dead [diff] | |
parent | 9c36b4b924544817fc1c3a878211850e1b4bb1d4 [diff] |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad -s ours am: 3e9917dc91 -s ours Change-Id: I10946d0fa4e33dfedb60c9f3a37318fd4adbd991