| commit | 207db93a85d411d940b764fa428b74c7c8fdbdaf | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Aug 04 18:17:27 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 18:17:27 2018 -0700 |
| tree | 8c3db70c6823534b4e3c15948b030a17a5bc04a2 | |
| parent | ba6a80589e0f1cd3546c9f362e31df7f2b02faf2 [diff] | |
| parent | bab98e72ad4edaa0c2d8a0def684f095ba823541 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7fee2eab02 -s ours am: bab98e72ad -s ours Change-Id: I5921c0032b6d3d28745cbb7e0c2ddf54a13232ef