Lajos Molnar df876a110c Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge: 8514766 ...

automerge: 2a8dc00

* commit '2a8dc00eedeb2b8a9fa3560d8afa4cfd7c17d395':
  ImageReader: add support for compatible flexYUV buffers

2015-01-29 08:02:53 +00:00

..

java/android

Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge: 8514766

2015-01-29 08:02:53 +00:00

jni

Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge: 8514766

2015-01-29 08:02:53 +00:00

lib

…

mca

Add missing <string.h> includes.

2015-01-25 08:33:36 -08:00

tests

resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp

2014-11-21 09:57:52 -08:00