OSDN Git Service

Merge changes I90a48db4,I8b9815a0 into oc-dev
authorMyles Watson <mylesgw@google.com>
Thu, 1 Jun 2017 20:56:44 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 20:56:44 +0000 (20:56 +0000)
commitf97a090787f37d775f40506face18bd2a65ab8b9
treeb7ef2c4352b997b097559e28154f9d9492f0e123
parentf5a1d5e286e7cc37610b84e0034ac1bfa2aa701f
parent4d92cda9c76b38e791dff5351063b86effc9250c
Merge changes I90a48db4,I8b9815a0 into oc-dev
am: 4d92cda9c7

Change-Id: I565e5ad59f8200393deeb359349b012c1cca9967