Lajos Molnar a7cd8835bb am a861245f: Merge "VideoView: add addSubtitleSource" into klp-dev ...

* commit 'a861245f06e854d47ff44155ebd3ac0e31c0cb2c':
  VideoView: add addSubtitleSource

2013-09-03 15:53:28 -07:00

..

java

am a861245f: Merge "VideoView: add addSubtitleSource" into klp-dev

2013-09-03 15:53:28 -07:00

jni

am 3f8da091: Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev

2013-09-03 10:49:07 -07:00

res

am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev

2013-09-03 15:40:14 -07:00

tests

Merge "Use core-tests-support instead of core-tests" into klp-dev

2013-08-30 23:21:27 +00:00