| commit | a7f70bed81d1e01e3ca4a2fbff9403ab0afdc345 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jun 08 23:30:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 08 23:30:07 2017 +0000 |
| tree | 1498c73f0a4a374bc8ed53bcd67326d649630f1a | |
| parent | 98ee6de62c275cd1157a4006d74b72b6424df443 [diff] | |
| parent | 748604c1abe935f1139ada150f192803b64972c1 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636 -s ours am: 95657195ca -s ours" into oc-dr1-dev-plus-aosp am: 748604c1ab -s ours Change-Id: I775df6af91f1155c2a43358d50a1e92cbc1dd580