commit | d848c25c8d0170ec3e8f8596af7d7039ee93f305 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Aug 02 15:04:55 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 15:04:55 2017 +0000 |
tree | 788406de9bea618c693911d165b4baf7252e91b2 | |
parent | eaff05d66a6c1b79866a08fa9958a3815ed82a92 [diff] | |
parent | 9f38e0f5e7848ee9ee3c9f5a74f697d4cba85d7f [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9f38e0f5e7 -s ours Change-Id: I63a334e79ffeff50a02e1a428cfa8b9c6ceae4fa