commit | 94cef82e884b3b91643482936264dd3e0fa72281 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Aug 04 08:02:29 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 08:02:29 2018 -0700 |
tree | 6d94f7072a097a8ed700480ede4be7fa8608e5a4 | |
parent | f8b1680d5b0f1e7322a2c24b66c1ba19362d4f44 [diff] | |
parent | 9e2873bdf19cf5a05307c48e28f8fdb305dfcfeb [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a86673c41 -s ours am: 248a23d07b -s ours am: 9e2873bdf1 -s ours Change-Id: Icb0ec26a28f88f1af6a19c1259f82eeae6a23df2