OSDN Git Service

am 3ffc0f1e: (-s ours) am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no...
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2015 10:23:49 +0000 (10:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:23:49 +0000 (10:23 +0000)
* commit '3ffc0f1e81f6a45190cd928759e728ecbdfaf0b9':


Trivial merge