Lajos Molnar fb73df74d5 am 736469ad: am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev ...

* commit '736469ad5d9b21071d187a07e8f2575910960b7d':
  Fix CalledFromWrongThreadException in MediaPlayer's subtitle support

2013-09-12 21:57:21 -07:00

..

java/android

am 736469ad: am 8c16943e: Merge "Fix CalledFromWrongThreadException in MediaPlayer\'s subtitle support" into klp-dev

2013-09-12 21:57:21 -07:00

jni

Merge "Remove dependency on JNIHelp header side effects." into klp-dev

2013-09-12 00:01:28 +00:00

mca

fix-up dependencies to gl headers

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

tests

Camera2: Immutable metadata

2013-09-11 13:18:10 -07:00