Elliott Hughes 10596fbcce resolved conflicts for merge of 3ce4f3d0 to master ...

Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210

2014-04-28 13:53:25 -07:00

..

java/android

resolved conflicts for merge of 3ce4f3d0 to master

2014-04-28 13:53:25 -07:00

jni

Merge "ImageReader: remove RAW_SENSOR format translation"

2014-04-25 19:44:20 +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