Jae Seo 4c9e57f156 resolved conflicts for merge of ebe661c4 to master ...

Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4

2014-06-03 17:06:58 +00:00

..

java/android

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

jni

am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."

2014-06-02 18:32:26 +00:00

lib

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

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

mca

Remove deprecated BufferQueue constructor

2014-03-12 17:02:07 -07:00

tests

camera2: Change android.lens.focusRange to Pair<Float,Float>

2014-05-30 11:28:49 -07:00