| commit | 27339f0d684ca6a74e6fd8d0f7a8a3321e6ed4b5 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Aug 04 18:18:48 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 18:18:48 2018 -0700 |
| tree | 89e45ab585945b6151ce176bff18accf8f555e16 | |
| parent | 0dfd41dd7687a6e41817aefe0d0a34f93fa870be [diff] | |
| parent | b1a318dbdd99297c8c6142b6b2e097bdc6804909 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c74fcad61b -s ours am: 5b294cccf9 -s ours am: b1a318dbdd -s ours Change-Id: I98272b493f1c0a25aa362971f567ccea547445f8