Narayan Kamath fad6fa7a04 am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint" ...

* commit '21ccb07fbe97097b6540097d89dd456447779178':
  Cast CallVoidMethod's size_t parameters to jint

2014-04-30 17:36:14 +00:00

..

java/android

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

jni

am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"

2014-04-30 17:36:14 +00:00

lib

resolved conflicts for merge of 4f342e87 to master

2014-04-03 11:51:37 -07:00

mca

Remove deprecated BufferQueue constructor

2014-03-12 17:02:07 -07:00

tests

camera2: Fix broken camera metadata test due to key rename

2014-04-22 16:29:45 -07:00