Eric Laurent 093789755e resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp ...

Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d

2014-12-10 10:42:08 -08:00

..

java/android

Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev

2014-12-10 01:33:09 +00:00

jni

Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033

2014-12-09 23:20:39 +00:00

lib

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

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

mca

Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

2014-12-04 01:04:09 +00:00

tests

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

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