OSDN Git Service

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

Change-Id: I320558eb3b6dabebb3c5b05a2d6633e9355f952c


Trivial merge