| commit | 1ade98c41420ca91911531ef8384cd2ed8d0fb71 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Aug 24 16:53:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 24 16:53:06 2017 +0000 |
| tree | 7092bbe0f822a96f5fc9868e568c24025f254375 | |
| parent | b4d791d585e7d5077710a2d5728e9316f679947a [diff] | |
| parent | 8c169398f36de01cefa4e6d853711cc5da07afcc [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 1040e35e55 -s ours" into oc-mr1-dev-plus-aosp am: 8c169398f3 -s ours Change-Id: Ia29e057158359e9b607659c8d5297632196e0b2f