Nick Pelly c81ec79d1f am 0592832c: Merge "Attempt to fix simulator build." into gingerbread ...

Merge commit '0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp

* commit '0592832c5e61b9c0008a4410f263ea0b0b991f05':
  Attempt to fix simulator build.

2010-10-22 09:03:21 -07:00

..

config

…

java

am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.

2010-10-21 21:08:20 -07:00

jni

am 0592832c: Merge "Attempt to fix simulator build." into gingerbread

2010-10-22 09:03:21 -07:00

res

am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread

2010-10-21 20:17:56 -07:00

tests

am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread

2010-10-18 13:56:31 -07:00