| commit | f737dd84757901878a8a1709cd9d98b80e154593 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jun 22 13:57:43 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 22 13:57:43 2017 +0000 |
| tree | e9b75807284b5050ff6f5d5e78f236fa76bda1d4 | |
| parent | 9fb6cdc90546f07d8213c3f63d1d430863525b10 [diff] | |
| parent | 7a5ba9d90115d0dbca093a21237e39a8aaf70422 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c -s ours am: 70c2a7b0d9 -s ours" into oc-dr1-dev-plus-aosp am: 7a5ba9d901 -s ours Change-Id: I0da65f2661d2902474fb3dcbb24b30580b3f9e3b