Lajos Molnar 4e8f5e3f78 am 6118745b: am ab62870c: Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev ...

* commit '6118745be53fed977edf1b29a2b0ecd2222e33a8':
  MediaFormat: add getInteger with default value convenience method

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

..

java/android

am 6118745b: am ab62870c: Merge "MediaFormat: add getInteger with default value convenience method" into klp-dev

2013-09-12 21:57:28 -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