OSDN Git Service

Merge "Fix disable/force stop app button incorrect state." into oc-dev
authorFan Zhang <zhfan@google.com>
Fri, 21 Apr 2017 21:03:20 +0000 (21:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 21:03:20 +0000 (21:03 +0000)
am: 6190c159e8

Change-Id: I3aff38236f1eeb69779a53a1b971f83f69bc752d


Trivial merge