commit | 76468d35d44d1503d01a68160235cee477be94db | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Aug 11 19:39:26 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Aug 11 19:39:26 2019 -0700 |
tree | a3bc20f36882d83c3049f7ff6e72a859f7067570 | |
parent | c8e2ca32ab7f52d8e3ec7bb9d1d20f937497a6f6 [diff] | |
parent | f6bd74a65dffa43d19d386698a2db9a8870eae5e [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 4712246f85 -s ours am: a0732755c2 -s ours am: f6bd74a65d -s ours am skip reason: subject contains skip directive Change-Id: Iaa40b746aa00c3f29e32f3e4b2c9cefea919f4e5