commit | 07cf18ecbe0fbf310e2d60b534be6ebbc1fe1206 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 05 17:32:20 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 05 17:32:20 2017 +0000 |
tree | 434ae7c09a00f993982bf4c112d545294aa38a35 | |
parent | 79e26f3a19e6521b12ffdea49cfb68460cc94696 [diff] | |
parent | fb5fdf1012ca76dcf02a890c744450975dbb2375 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 5228e5d0cb -s ours am: fb5fdf1012 -s ours Change-Id: Ib99c9f8b11e9cb0c2b8c8502e24b2f80ff23686c