| commit | fb36db484e57519d9a78392efc9025ad31b3bb18 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Jun 27 20:26:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 27 20:26:30 2017 +0000 |
| tree | 688c2bbf0ca2381b5f5dee26e1cebe1c13047a39 | |
| parent | 508f816f64d4c9c133ee96329d00037e5ef66058 [diff] | |
| parent | 8f1ccc824c59746371b6e7e0aa97be7195484484 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f -s ours am: fb1469df92 -s ours" into oc-dr1-dev-plus-aosp am: 8f1ccc824c -s ours Change-Id: Ic7140d196944adf7a925f3120de66aa3bb18457a