Lajos Molnar 9c5b14977c am a0d70290: am 171c63db: Merge "Add subtitle support to VideoView." into klp-dev ...

* commit 'a0d702908cc2da75e0102e1a2f276e2b3feea198':
  Add subtitle support to VideoView.

2013-09-04 14:38:51 -07:00

..

java

am a0d70290: am 171c63db: Merge "Add subtitle support to VideoView." into klp-dev

2013-09-04 14:38:51 -07:00

jni

am 22f36b1a: am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev

2013-09-04 10:40:09 -07:00

res

am 70c2dd93: am 2cf8138b: Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev

2013-09-04 07:21:16 -07:00

tests

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

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