OSDN Git Service

Merge "bootctrl HAL uses "default" service name" am: 9877cf296f am: c68beb8712
authorChris Phoenix <cphoenix@google.com>
Mon, 23 Jan 2017 21:12:25 +0000 (21:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 21:12:25 +0000 (21:12 +0000)
am: f6835e18ef

Change-Id: Ie9fd8324f06314536b169a6d79e80453bc6f503a


Trivial merge