| commit | e976a1324bd87d69e9c31bd1efaa1db66273efd0 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sun Oct 14 21:44:11 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Oct 14 21:44:11 2018 -0700 |
| tree | 9a8bf6a79a1851abc31ae9436ba7f11634f3f316 | |
| parent | 2542ad16f964392cf07f4ac3d2309501269811d8 [diff] | |
| parent | 17c5d327e10a5b0b16e56e2ec987d7e959173447 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d85b5fa196 -s ours am: 17c5d327e1 -s ours Change-Id: I16b88372629a123e38a85248a217111501994b1b