Romain Guy 53e7ae9065 Merge "Fix possible infinite loop when purging textures."

2010-09-08 15:16:13 -07:00

..

config

…

java

am 5fdacb8a: am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread

2010-09-08 14:38:20 -07:00

jni

Merge "Fix possible infinite loop when purging textures."

2010-09-08 15:16:13 -07:00

res

am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

2010-09-08 14:38:15 -07:00

tests

am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp

2010-09-08 11:07:30 -07:00