commit | c9f107b48d794006041e8a8ebfd00b314cbaf270 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Jun 21 20:22:37 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 21 20:22:37 2017 +0000 |
tree | 02a15de385fdc45150b7218064e573b3580a8b97 | |
parent | 6d22321d9859f2e20a3b2ee14d0bc9c13e348f23 [diff] | |
parent | 31219d700a9eb39d2fb99620652ce602357db603 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 0412be040b -s ours am: 31219d700a -s ours Change-Id: I75f1f61dc0b987d3e6a5e20fc39a620d5a1fe4d5