| commit | c23243a0e1a70003ad2d6ec381b31dc7224e91d9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jun 16 15:38:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 16 15:38:39 2017 +0000 |
| tree | 4623faa14e9ef81071857aad08740bf372c95edc | |
| parent | d88d5cd00a01e388e74c8e463fb7f326d670cc8d [diff] | |
| parent | c9c029623ec3b49b830230e52a2fb9fba9df3f58 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: d97c62a1da -s ours am: 0c4e13b41d -s ours" into oc-dr1-dev-plus-aosp am: c9c029623e -s ours Change-Id: Iab4eedcf172e30e4b091a93e55471ce4ac00e7be