commit | 5d51d02a18574139ecab3f0c129892d3b3785857 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Aug 15 21:18:22 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 21:18:22 2017 +0000 |
tree | 3aaf12f4e43ad545f5458123c692ebb70c49a2d6 | |
parent | d51c1288d807f1f2a6f408b744125f234be1284a [diff] | |
parent | d08215a979b8ca2bde2bd00f55244f1cdd21624b [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: cb36b76ec4 -s ours am: d08215a979 -s ours Change-Id: I92dcc830329360c39006131c18bcab9ed98ded7e