commit | 95735cdae4d1d7a7f95e9b938839f17f727416bb | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jul 07 16:46:07 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 07 16:46:07 2017 +0000 |
tree | 2a54505836bf41f6fbe0801a79fb4fca05ae5b30 | |
parent | 6b52e303b1d4843c27e50ee8b31b80637d0e829f [diff] | |
parent | 7945f44af0164767dd242a56841aa6d4bd07854e [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9da0a744c5 -s ours" into oc-dr1-dev-plus-aosp am: 7945f44af0 -s ours Change-Id: I6e99c903d9f0b8d7172d74dc5cffd9242c69a0eb