OSDN Git Service

Merge "Overcome disconnect during oem override" am: 5e093d997a am: 961cc1867b
authorBadhri Jagan Sridharan <badhri@google.com>
Thu, 11 Jan 2018 21:06:11 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Jan 2018 21:06:11 +0000 (21:06 +0000)
am: afd07cb040

Change-Id: I7ae6b814093c2987d890688aefae53559072c771


Trivial merge