OSDN Git Service

Merge "Show user running state in dumpsys user." into oc-dev am: 2692dafa9b
authorMakoto Onuki <omakoto@google.com>
Thu, 30 Mar 2017 15:27:53 +0000 (15:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 15:27:53 +0000 (15:27 +0000)
am: 60e6e538f9

Change-Id: Id37b0c99f10a2b6f9506778f600e3f98a234099c


Trivial merge