commit | a961652251516be18111f787d2a6fe688ee97eb8 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Oct 06 00:00:21 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Oct 06 00:00:21 2019 -0700 |
tree | 636a74d05977020efb238e163c7f026975e372b5 | |
parent | 0dd6d04b00b9ca6f5d0df99462664c438ebc7e99 [diff] | |
parent | dcad223fb3ca064e26ada9f68fb22bbed1cf64ce [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours am: efec4764b4 -s ours am: dcad223fb3 -s ours am skip reason: subject contains skip directive Change-Id: Id7cf22705c420f2b6a6c0388aac1432d3bdf4401