tree 37e4d6cc14f09d62190720c08673ce84258836a5
parent 26b4be8dfa4a2d9a59cf3ea95f7c1d0ff5d99523
parent 060d5a0e0a304400ee2ec1479346a37793bce0d7
author Jeff Sharkey <jsharkey@android.com> 1466705727 +0000
committer android-build-merger <android-build-merger@google.com> 1466705727 +0000

Merge \"When uninstalling, only kill the requested user.\" into nyc-dev
am: 060d5a0e0a

Change-Id: I3975462d7f027cc4fd449c56ba0c5f6442369a1b