| commit | 6141ad5079f1791e483e4387ea5aad1e3875ea16 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Oct 13 19:59:49 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 13 19:59:49 2018 -0700 |
| tree | 1f23c99852cb463669b7afc0336f57006251d231 | |
| parent | cf6ae73d4c0fc04eda43462afa5b5183a4b90de2 [diff] | |
| parent | fe42418de4e8a1911c785af078d971b41f3a41d3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fe42418de4 -s ours Change-Id: I04ccad51a0335212a71a0b9045a2eea6ba9495f1