commit | 56889434fb3445abcd0ef43bf844bbc0569a6453 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Aug 16 19:36:02 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 16 19:36:02 2017 +0000 |
tree | 1a4e570f95188a6147ea8b6571d7ff6bab060dec | |
parent | c470adf056bfbbff1d1231ec40b9608320378c3b [diff] | |
parent | 2eb12cad3fbb2cd7ae9f4ac509561d5268bca1ec [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6d995219d9 -s ours" into oc-mr1-dev-plus-aosp am: 2eb12cad3f -s ours Change-Id: Ie3f5a6993414aa123b1dbeb8be27beead2885d5a