OSDN Git Service

am 4db59328: am d8b0edbf: am 8f5105c6: Merge "Add permissions associated with app...
authorDianne Hackborn <hackbod@google.com>
Tue, 22 Jul 2014 13:53:04 +0000 (13:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Jul 2014 13:53:04 +0000 (13:53 +0000)
* commit '4db593286f561ad5af1c32f9dbd12ebd8ca0d242':
  Add permissions associated with app ops.

1  2 
api/current.txt

diff --cc api/current.txt
Simple merge