commit | d387b1b2b9bb9fb7fa847e9f9b7b49c002854beb | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jul 22 12:54:55 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 22 12:54:55 2019 -0700 |
tree | d39a21d3f98f77e8c31d15cd804b889ad8e36bee | |
parent | 296c5ef20e1c498280e963cbe21cb6521554503a [diff] | |
parent | 22fce7c88ce4cf23e49e9203019a5de8399450cb [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 09da14be40 -s ours am: 76a64e725c -s ours am: 22fce7c88c -s ours am skip reason: subject contains skip directive Change-Id: I31b98eb4704ccb706ae9d5a5d3273ea89eccd246