tree 1d06af77fd33f0e6a3bb90a360acd8f687ffc5a0
parent babf47916706c82ae6aea8af017398249fe1f0ee
parent 4fe6b76b6ed79e8bc582f5f9f1352a276d7f7f2d
author Christine Chen <christinech@google.com> 1381173695 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381173695 -0700

am 4fe6b76b: am 888df858: Merge "Adds STOP_APP_SWITCHES permission." into klp-dev

* commit '4fe6b76b6ed79e8bc582f5f9f1352a276d7f7f2d':
  Adds STOP_APP_SWITCHES permission.