| commit | 8fe4d65e324f858b9098ba3f5be7f4d616c1fd37 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Oct 15 03:44:06 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 15 03:44:06 2018 -0700 |
| tree | bff25596cdc8cbd4f10c746d382a98fd49d12159 | |
| parent | 586490d05b38e74fa0b19358a5a4726be1bbf198 [diff] | |
| parent | 20642c19ec33c360747b32a901fd44d7d0c8bb4e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 15b8498906 -s ours am: 20642c19ec -s ours Change-Id: I238f72bdc674cc520c3e696df05e25102cdbb9cf