Alan Viverette 6416729c47 Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev

2013-09-03 23:51:35 +00:00

..

java

Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev

2013-09-03 23:51:35 +00:00

jni

Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev

2013-09-03 17:37:10 +00:00

res

Merge "Block ble adv api based on resource config" into klp-dev

2013-09-03 22:36:09 +00:00

tests

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

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