tree f948e1e057028e8e6ddea2ea5884da3a6291e4bb
parent cd983732725bc7cabdbc16fad14f878289fe1b9d
parent 8d3069503e64dd573eed12d66da0fd51ded1b7b5
author Steven Moreland <smoreland@google.com> 1487044462 +0000
committer android-build-merger <android-build-merger@google.com> 1487044462 +0000

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

Change-Id: I6f4d5148e41181a4498fe1bcc3b2e9e0551785fb