| commit | f31147a9d28e12f8fd390696cda6291f61e46ab8 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Oct 26 20:51:04 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 20:51:04 2019 -0700 |
| tree | 242542fdc0ffe1cd7a9ff55a688e2720a6b38f9a | |
| parent | 68f00de77a2a69fda8098f63b6ddcf30e3010142 [diff] | |
| parent | 44bbac546c90d71c742141c86bfa1cc3a9a5aaff [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 3447b7b66c -s ours am: 0079161fcd -s ours am: 44bbac546c -s ours am skip reason: subject contains skip directive Change-Id: Idd9b5d23a8e2d851135ffaba8c71e5bb6dc1a1e8