commit | a895be2d1009ce9490350d7d4363a4386e023ea2 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 27 01:18:41 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 27 01:18:41 2017 +0000 |
tree | 673b6d3202d87edf16d5866bf98b72f2b1daa3b7 | |
parent | ab27f8535db91915c8264a4b52e76ed09722ffd6 [diff] | |
parent | 9744211b1f0398724e3b5fffaf0013cf365603b4 [diff] |
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am: 8080362358 -s ours am: 0ceb3853e8 -s ours am: 7395db8492 -s ours" into oc-dr1-dev-plus-aosp am: b42dbfd109 -s ours" into oc-mr1-dev-plus-aosp