commit | 1866df21f9ea8c5ee9de0fb7d91182e856d46ac9 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 20 10:11:43 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 20 10:11:43 2017 +0000 |
tree | 682a7846840ed27e236c3ae72b732f9703eaa185 | |
parent | f9a0de0fa3566111a1c506967f14a768246ea624 [diff] | |
parent | bb5cb8d3eea8c18e2a68f57bb0dcfdf235e35cf3 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3f9462d6a3 -s ours am: 3b79072040 -s ours" into oc-mr1-dev-plus-aosp