Marco Nelissen a80ac05f85 resolved conflicts for merge of 42f55d1e to master ...

Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec

2015-03-12 16:17:45 -07:00

..

java/android

resolved conflicts for merge of 42f55d1e to master

2015-03-12 16:17:45 -07:00

jni

Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager."

2015-03-12 18:05:47 +00:00

lib

…

mca

Add missing <string.h> includes.

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

tests

Camera2: Remove unused parameters in ICameraDeviceUser#createStream

2015-03-09 11:15:30 -07:00