commit | bbeaae705d6dbf7eabcaede30bc118cbc9592280 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 12:39:42 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 12:39:42 2017 +0000 |
tree | c1278d5f98530cd445f45902fe99f8d73d3346f1 | |
parent | 6300674d277cdc3518285b1396ab9e65fe1b610f [diff] | |
parent | 6b1ff7073a370352f76e98938349ca95b84931bf [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a -s ours Change-Id: Ic62eae25c60977a427a5414e73d7c6f08cf204a9