commit | b395db96e9fedcd68ee50dbe548c71b4f2daa686 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Aug 15 23:20:37 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 23:20:37 2017 +0000 |
tree | 3aaf12f4e43ad545f5458123c692ebb70c49a2d6 | |
parent | 34cf6ba39c170933824f5d9d158ebb9057789f44 [diff] | |
parent | c26f2d4d9b2796a2f768e94704c33db9aa1a35df [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 341b700798 -s ours am: c26f2d4d9b -s ours Change-Id: I82ac1078c8bbce7161cdb6731a744b2e27445206