commit | fdda0a9a45cd41a9d82ec7fe6f1bbeadd0068311 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 12 17:32:20 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 12 17:32:20 2019 -0700 |
tree | 11697450473e577d08ac66ddba71f0746a59feea | |
parent | 62b71468ec19d43a44f681062a97198104e2dff2 [diff] | |
parent | fb26ea4356d56e5b04ca715d423e1976f19148d8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 74937235a5 -s ours am: 1a129bc680 -s ours am: fb26ea4356 -s ours am skip reason: subject contains skip directive Change-Id: I1aea72a9fa35018bc1985ced3288d4dcf8de8e8a