| commit | 93a97955173136d5a2dd52b2b500496d3c12c992 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Tue Nov 20 18:18:31 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 20 18:18:31 2018 -0800 |
| tree | a371c132c47a76202958efff5a9abf16fad25bdc | |
| parent | cda60c330078328b5e0380a47da2340a4fd0cb4e [diff] | |
| parent | 4dbc592d0de3bb3dbd10ddbd11c7fe6a0bc5c0a0 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: d01f664cae -s ours am: f1cb8dbdee -s ours am: 4dbc592d0d -s ours Change-Id: I5c18ceae8b0545b06098a59c4858ff5c729ca440