commit | 28099da9863d488444f06c7757665d12489590f8 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 27 01:28:21 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 27 01:28:21 2017 +0000 |
tree | 2046b42596d2c6d2fe4e96b2d921363c1035d957 | |
parent | 972d146ca79266054920f6d515ec469218ca9174 [diff] | |
parent | cf7993706c9c5b5d0cf6b2be2e0f9a88cf3880b2 [diff] |
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours am: aec51f497c -s ours am: b57520aae6 -s ours" into oc-dr1-dev-plus-aosp am: 0b190bd9cb -s ours" into oc-mr1-dev-plus-aosp