Roy West b4a28f2426 am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread ...

Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp

* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
  Partial fix to bug 2992589: Edit dev admin strings.

2010-09-29 10:40:06 -07:00

..

config

…

java

am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread

2010-09-29 07:53:06 -07:00

jni

am 038cabe0: NFC integration

2010-09-28 22:40:18 -07:00

res

am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread

2010-09-29 10:40:06 -07:00

tests

am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread

2010-09-28 12:41:42 -07:00