commit | aba73c12e6b7d9fa1d7f83734ee89b4d59037399 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jul 15 11:03:47 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 15 11:03:47 2019 -0700 |
tree | b1e0cd8566ae4ce5e50f8b249a1bf6da241d7193 | |
parent | b25de3db17bee1c15d1452f9a110daf2eaae6f5b [diff] | |
parent | 2b284890a382b9395e36a28155647c396242898e [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 6097523938 -s ours am: 7941953127 -s ours am: 2b284890a3 -s ours am skip reason: subject contains skip directive Change-Id: Ie5c73a634969fded61adfc3a69dc8f0af0b2f6be