Joe Onorato 5be893a71a am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread ...

Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp

* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
  Don't throw when userActivity fails because of the permission check.

2010-10-11 13:55:15 -07:00

..

android/server

am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread

2010-10-11 13:55:15 -07:00

trustedlogic/trustednfc/android/server

NFC integration

2010-09-28 22:36:27 -07:00