commit | 23b8ff2157d3c977d102fee06f669f1b9176c3ea | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Aug 01 15:40:03 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 01 15:40:03 2017 +0000 |
tree | 6e5d5a2890dab728c85744adc651098d03797777 | |
parent | 8822684604ee6b0c3414a4d07c6fd043725a5ed5 [diff] | |
parent | 08674f3a25fc36355e296afb61d30e63e5b81928 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 -s ours am: 08674f3a25 -s ours Change-Id: I08a17c4bfc3ec26a707b903a7f244a6f9387cc30