commit | 2d17b86963d7ef35a1c2e324474d82d387da2743 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Sep 25 21:37:46 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 25 21:37:46 2019 -0700 |
tree | 0cb4de1e51ab0831b5df5f427cb083b05f112412 | |
parent | edd0e2784d145217cc9b61316d590b6312d17690 [diff] | |
parent | a33dc507eab88dc09ed5c0032d7af15399c51bdd [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8182a8e092 -s ours am: a33dc507ea -s ours am skip reason: subject contains skip directive Change-Id: Id7c837a6241f71887a7f67dc1dcdb5b4d2c4d10c