| commit | 0dfd41dd7687a6e41817aefe0d0a34f93fa870be | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Aug 04 18:14:52 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 18:14:52 2018 -0700 |
| tree | 89e45ab585945b6151ce176bff18accf8f555e16 | |
| parent | 0589f7bbad1581b540e983971b33cbe13aff4caf [diff] | |
| parent | 845a8eeb0f4843cb9fded105496c299d851f10a9 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 957b4da1b0 -s ours am: 5511368d7e -s ours am: 845a8eeb0f -s ours Change-Id: I0ddb5004116a72c1993d25e7f41a0ba98af5550d