| commit | 80d38b82fb8e31c071d62434a4e613a6087b0b49 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Jul 11 04:15:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 11 04:15:18 2017 +0000 |
| tree | b9bdfe604ef692003c7d33e81b3b4678f6eba499 | |
| parent | 1bf211b56131d831196ef7f43911adda328adafd [diff] | |
| parent | 5d363f961eca66e07f57caf2a4f1faae1b54c828 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 88e9aa19e2 -s ours am: 91dcbe4bd9 -s ours" into oc-dr1-dev-plus-aosp am: 5d363f961e -s ours Change-Id: I3cbd4519bf68c9e14031b323df8b72fd1fd9fce3