Glenn Kasten e27002d77f resolved conflicts for merge of 1c92912b to lmp-dev-plus-aosp ...

Change-Id: I5a57218e81dff86f46af7067d47f7af816e2d12c

2014-10-02 10:19:12 -07:00

..

java/android

resolved conflicts for merge of 1c92912b to lmp-dev-plus-aosp

2014-10-02 10:19:12 -07:00

jni

camera2: Use valid dimensions for RGBA8888 gralloc buffers.

2014-09-30 13:54:20 -07:00

lib

Fix name error in com.android.mediadrm.signer.xml

2014-05-30 08:27:33 -07:00

mca

resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp

2014-10-02 11:48:08 +01:00

tests

resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp

2014-10-02 11:48:08 +01:00