| commit | d6225b1e568139b2890e701f9fdbc10a5421ee90 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Aug 04 08:27:29 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 08:27:29 2018 -0700 |
| tree | 6d94f7072a097a8ed700480ede4be7fa8608e5a4 | |
| parent | 5036c4418a2378bb9a21bf3a8b67fa3cd377b13a [diff] | |
| parent | 1a169bea839934c7912704d9f53211ff81871c30 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a68185d54b -s ours am: 6791b9c62e -s ours am: 1a169bea83 -s ours Change-Id: I29567f606b9b2d7cab827112029da460727b00f0