am 0df8ec82: (-s ours) am 268b9d07: Merge "Don\'t cache results of permission check" into mnc-dev

* commit '0df8ec82d6be37fc1ae085c7dde7ab67061b314e':
tree: 8924d31ff2ecb8b544ab35dab62f515aac397156
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags