| commit | dac00315928cd4e9aa4f6f70ca1e6ba1a057f9cb | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Oct 15 03:53:13 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 15 03:53:13 2018 -0700 |
| tree | df1df142303cdb3b5de158d3bd82b02dbb4cdc48 | |
| parent | cca939d0e7c164503ba03ccb4d77515f584e6a28 [diff] | |
| parent | cb69264f593f39d3676a3e9772962fbd1d5a1a82 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d0968290ba -s ours am: cb69264f59 -s ours Change-Id: I73055be4d21a7c171b7cfd69f74a6c4d38ce38c5