OSDN Git Service

Merge "Merge "Hack around b/36066697." into oc-dev am: e139434e3a am: 8effb089ed...
authorJosh Gao <jmgao@google.com>
Tue, 20 Jun 2017 04:45:41 +0000 (04:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 04:45:41 +0000 (04:45 +0000)
commit38702f6c1708ed7da4ccb70b4a7b2c2b646bbdd7
tree5c14586b5da04b4a8ef903df07dec810108e3169
parenteb72a37abf5075b6e1183b2fc06079ecb4f335e5
parent2cf5ed1173d1992017b6d384630b5b6a37fe5fc4
Merge "Merge "Hack around b/36066697." into oc-dev am: e139434e3a am: 8effb089ed" into oc-dr1-dev-plus-aosp
am: 2cf5ed1173

Change-Id: Ic4f60b461ab04541db65c171c57775ab8b4c1217