| commit | de3f29ac75bae8e261f964ad262f759cf159b0d6 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Apr 17 07:47:12 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 17 07:47:12 2018 -0700 |
| tree | 83bffeef1afb15312e7f275939f79fcad38a6c58 | |
| parent | a57da39f854dd9a70307d3090783e6a977b07068 [diff] | |
| parent | a3ff96d76a3b118304e28bbc7bdd977f84ce0058 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 0262bf8793 -s ours am: a3ff96d76a -s ours Change-Id: I688691ad835952bba5943eecddc59c85b5164565