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)
am: 2cf5ed1173

Change-Id: Ic4f60b461ab04541db65c171c57775ab8b4c1217


Trivial merge