commit | 5b294cccf9d468db9b158b83db3288fa33d66d4d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Aug 04 18:10:14 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 18:10:14 2018 -0700 |
tree | 8c3db70c6823534b4e3c15948b030a17a5bc04a2 | |
parent | 5511368d7ec24362e8de6598134bd27c56ff42dd [diff] | |
parent | c74fcad61b4a680d8f2ce61c6dfd70b9ee37bc47 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c74fcad61b -s ours Change-Id: I9d29babbf47cea1bfa32aafdb5dc77b5d5eda42e