commit | 1f6887eaeb6cbfc2adf8d4c8e96b117ff77bdee5 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Jul 22 17:22:12 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jul 22 17:22:12 2017 +0000 |
tree | c39bbee8debf15cb55f82acc82d6fb156ed03581 | |
parent | 49ccd1854d0e6df4ace18149c732531f406d0078 [diff] | |
parent | 0412212ef1817c17fecfc4ec16d52f0ea99b6df7 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7c1b73eab7 -s ours am: 0412212ef1 -s ours Change-Id: Iad4bbdabecda86f3ba1420a8fcfa3c7b3e2a7752