commit | 0f4be8b86be534e357be958e7604046debb923d9 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 12 16:21:24 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 12 16:21:24 2019 -0700 |
tree | 134f2816f23bdf14642929872a67a41915c644c1 | |
parent | 0ad1375cd6f312b8f81b999aae296ba813080923 [diff] | |
parent | c40702b4c3dc0c8d8131d86ae41cd5f0fbb1932a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5a1b1a1b79 -s ours am: c40702b4c3 -s ours am skip reason: subject contains skip directive Change-Id: Ie09e61a6d027d99a9b98baddc702f5e85f286e38