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

Merge commit '5be893a71aa72f54660496dd01cfad66adb86b8f'

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

2010-10-12 13:22:41 -07:00

..

com

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

2010-10-12 13:22:41 -07:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00