commit | 77f48f93c96efaec9eaec3e71fe15eed9e110df9 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Apr 08 08:19:55 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Apr 08 08:19:55 2017 +0000 |
tree | 7fa8359790e72a8373ee470e6c07de99fb126079 | |
parent | bd986074671cea307848e77feea90e0b9e5ed23e [diff] | |
parent | 5fe7eeb58fe31042e5e5d81b33a5d5e18f2faf77 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: ce1e6999a0 -s ours am: 5fe7eeb58f -s ours Change-Id: I03b5cb7fcef47a9cc6bac750ec035493cf868f1c