am b087ceea: am 40eade14: Merge from open-source master

* commit 'b087ceead79bcb304e5793c6ae9109ce590847dc':
  Fix crash by "adb shell pm list permissions -f|-s"
This commit is contained in:
Jean-Baptiste Queru 2010-12-02 08:03:25 -08:00 committed by Android Git Automerger
commit 3263f79a95

Diff Content Not Available