commit | 972d146ca79266054920f6d515ec469218ca9174 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 27 01:25:00 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 27 01:25:00 2017 +0000 |
tree | 2046b42596d2c6d2fe4e96b2d921363c1035d957 | |
parent | 877e38f4d98dbbadc118120bb6e0430dc95a0f9f [diff] | |
parent | 747ee7f01b9b5edd64c3c401901436b111034b88 [diff] |
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am: 9cf9d294ef -s ours am: e2f2fbaea1 -s ours am: f417f591a1 -s ours" into oc-dr1-dev-plus-aosp am: b99a5acab9 -s ours" into oc-mr1-dev-plus-aosp