tree 1adc3cb3d369cb2669bdf570d97eeb255e021988
parent 64af14a4d2231adf5dcc2336b0f672c2f52c97a5
parent 69bd0bf22a1886fef0d621564856bcc387bad342
author Iliyan Malchev <malchev@google.com> 1474934895 +0000
committer android-build-merger <android-build-merger@google.com> 1474934895 +0000

Merge "build: add hwservicemanager to the core packages"
am: 69bd0bf22a

Change-Id: Icd688e7e59c95ae91787c9f35e5c3d814062b1ce