commit | b521fe67561be3008f20a6d0dd483477aca4ba81 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 01:59:15 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 01:59:15 2016 +0000 |
tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 | |
parent | ffcdd21814d459f31e0da844f30e60a5c78f13cf [diff] | |
parent | 7edeb95b59e506b10a9c47bbe100c427a250597d [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fb559183f -s ours am: 7edeb95b59 -s ours Change-Id: Iba0a82ad3757259bcaf4a211f656cb7c09da39d2