Wei Huang 6ba0311879 am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo ...

Merge commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f' into froyo-plus-aosp

* commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f':
  bug 2542580: fix bad icon.

2010-04-05 15:42:30 -07:00

..

config

…

java

am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo

2010-04-05 14:59:47 -07:00

jni

Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo

2010-03-31 18:36:35 -07:00

res

bug 2542580: fix bad icon.

2010-04-05 15:09:52 -07:00

tests

Merge "More framework tests cleanup." into froyo

2010-04-01 21:45:41 -07:00