tree 35e6d8a1bc2f2593d0b794ce610e6aa1301e2f32
parent ced2abbc7b97d5f719abda0d3e866466a1dd68d1
parent 1a384933dfb6c78363316a6ac09badde4cd2f0ac
author Steven Moreland <smoreland@google.com> 1478640970 +0000
committer android-build-merger <android-build-merger@google.com> 1478640970 +0000

Merge "Update for namespaced services in hwservicemanager." am: 605df82c9e am: 3dcee9882d
am: 1a384933df

Change-Id: I3ab231d9342ec1100866d3da2d752c70793cdcd8