commit | 04400064e124201ebea19ea5d16c2a53efa2b2c0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Jun 15 09:16:50 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jun 15 09:16:50 2019 -0700 |
tree | f01b3069cb470dc3df12b46a575efe164e6e55fa | |
parent | 5d9866ddaf30d27fa167ab85efa8becd36431fcc [diff] | |
parent | 51606189621b60b4214b9a28ffd23f4cba56cda8 [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 59b9b3af0b -s ours am: 2557c8ec83 -s ours am: 30592b127d -s ours am: 5160618962 -s ours am skip reason: subject contains skip directive Change-Id: I8f0d455d68701d5d53108d46e8b306eee2ede534