OSDN Git Service

am 40eade14: Merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:59:52 +0000 (07:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Dec 2010 15:59:52 +0000 (07:59 -0800)
commit34f9603301b2a77d2a1d04777dd4d33ea40caff2
tree1828739c054617c3bfa5cb08c15e109c60faa99b
parent9ee1ec38a6a3afc7b9de1a027b31f8fadb47e60d
parent4bdada2c615d2b4eae1189409521c98c0f96eb7a
am 40eade14: Merge from open-source master

* commit '40eade14bb87d24903588de04449fdfe2e1795cb':
  Fix crash by "adb shell pm list permissions -f|-s"