commit | eaff05d66a6c1b79866a08fa9958a3815ed82a92 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Aug 02 14:46:00 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 02 14:46:00 2017 +0000 |
tree | 788406de9bea618c693911d165b4baf7252e91b2 | |
parent | ff70153aa449a357004ab0d69a62e45229899679 [diff] | |
parent | 5a4b06803d6d8c7520c5c5774ea4187bbd7602e5 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81 -s ours am: 5a4b06803d -s ours Change-Id: I00ea5acfa526d81275424043bccb3455fd0d0d1b