tree 77e60021d16dc3ce581c794995b79545bc88bd57
parent 03436e9c60607ec80c3f5eea873091b2907a3e3d
parent 36ec1bc76f6cb2760445dd2d1f538a4ffdec40bb
author Steven Moreland <smoreland@google.com> 1487044639 +0000
committer android-build-merger <android-build-merger@google.com> 1487044639 +0000

Merge "Revert "dumpsys: add option to list hardware services."" am: 9555a5d497 am: d2390bea79 am: 8d3069503e
am: 36ec1bc76f

Change-Id: I5b16be2dae542e0becc114f36a2f75418e9911d5