Shimeng (Simon) Wang b65058a455 am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread ...

Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp

* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
  Don't force ended when full screen video is returned manually.

2010-10-18 17:04:47 -07:00

..

config

…

java

am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread

2010-10-18 17:04:47 -07:00

jni

am 208bb08a: Merge "Fix issue 3098880." into gingerbread

2010-10-15 18:42:06 -07:00

res

am e47150e9: Fix up NFC permissions.

2010-10-18 10:26:12 -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