Joe Onorato de6386b8a6 Merge "move recent apps around, attempting to make it not crash."

2010-09-08 14:30:05 -07:00

..

config

…

java

resolved conflicts for merge of a05088c1 to master

2010-09-08 13:02:55 -07:00

jni

resolved conflicts for merge of a05088c1 to master

2010-09-08 13:02:55 -07:00

res

Merge "move recent apps around, attempting to make it not crash."

2010-09-08 14:30:05 -07:00

tests

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

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