Justin Ho 31e5901e4c am b6634127: Merge "Updating popup center asset (v5)" into gingerbread ...

Merge commit 'b663412741ca3fa30473106a7bda3a8a95a5e194' into gingerbread-plus-aosp

* commit 'b663412741ca3fa30473106a7bda3a8a95a5e194':
  Updating popup center asset (v5)

2010-10-13 17:33:36 -07:00

..

config

…

java

am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread

2010-10-13 16:56:27 -07:00

jni

am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread

2010-10-07 15:46:57 -07:00

res

am b6634127: Merge "Updating popup center asset (v5)" into gingerbread

2010-10-13 17:33:36 -07:00

tests

am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread

2010-10-11 17:31:06 -07:00