| commit | 1cdb685a4fb38bde3e9f54732ca0b77a7d4f0ea2 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Sep 06 22:28:43 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 06 22:28:43 2017 +0000 |
| tree | 0120126d656e0b225f4e17f2e534cefbebd98301 | |
| parent | 92c2fc4fb701751a184f57bb1208ddab7973900e [diff] | |
| parent | b641261c97be0a35e3d4d5ee1f88d5278c30096c [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 018d1e066e -s ours" into oc-mr1-dev-plus-aosp am: b641261c97 -s ours Change-Id: I0f739bb83d767065760ef5e631503a0e9c9ff39b