Erik ffc9bf68d6 am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread ...

Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'

* commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
  b/3004029 Fixed content resolver loss

2010-09-15 19:10:10 -07:00

..

config

…

java

am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread

2010-09-15 19:10:10 -07:00

jni

am 14bc6b5d: am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread

2010-09-15 12:32:29 -07:00

res

am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread

2010-09-15 17:43:34 -07:00

tests

Revert "caching code retooled to reduce locking + handle SMP"

2010-09-14 11:55:24 -07:00