Teng-Hui Zhu 7a0949c60d am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1 ...

* commit '7af7e00b9112f15d1683ae93975a6fcd9dd34da8':
  Support html5 video switching b/t full screen and inline mode

2011-03-16 23:03:04 -07:00

..

config

…

java

am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1

2011-03-16 23:03:04 -07:00

jni

am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1

2011-03-15 13:42:35 -07:00

res

am 20ccaf6c: Import revised translations. DO NOT MERGE

2011-03-16 17:10:09 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00