tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent 58b89d0c8ad47540c8f1989489f9c5115db36f09
parent 4b94247b30ec6501b7d01d61cdf7c327f6a5d1c1
author Adam Connors <adamconnors@google.com> 1426893147 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893147 +0000

am 4b94247b: am d21fb012: am 012c9bbe: Revert "Block apps instead of uninstalling."

* commit '4b94247b30ec6501b7d01d61cdf7c327f6a5d1c1':