summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-07-19Remove deprecated locales - DO NOT MERGEandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseBaligh Uddin
2014-04-21am d9b5d894: Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang
2014-04-18Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."android-l-preview_r2l-previewidea133-weekly-releaseYing Wang
2014-04-18Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang
2014-04-17Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang
2014-01-07am 8e944e63: Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten
2014-01-07am be2086de: Merge "Fix the loading library issue of panorama mode in Legacyc...Glenn Kasten
2014-01-07Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten
2014-01-07Merge "Fix the loading library issue of panorama mode in Legacycamera app"Glenn Kasten
2013-12-09Remove deprecated localesBaligh Uddin
2013-08-06Loading the corresponding library in LegacyCamera appJun Tian
2013-07-04Fix the loading library issue of panorama mode in Legacycamera appJun Tian
2012-06-19Reconcile with jb-releaseandroid-sdk-support_r11android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r1android-cts-4.2_r2android-4.4w_r1android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3.1_r1tools_r22.2tools_r22tools_r21kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-devjb-mr2.0.0-releasejb-mr2-devjb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-dev-plus-aospjb-mr1-devidea133The Android Open Source Project
2012-06-19merge in jb-release history after reset to jb-devandroid-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr1.1-releasejb-mr1-releasejb-mr0-releaseThe Android Automerger
2012-06-19Reconcile with jb-releaseandroid-cts-4.4_r4android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9kitkat-releasekitkat-cts-releasejb-mr2.0-releasejb-mr2-releaseThe Android Open Source Project
2012-06-15Fix camera_control distorted in small resolution.android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devakahuang
2012-06-14Remove UI entry for disco video recording effect.Pin Ting
2012-06-14Remove UI entry for disco video recording effect.Pin Ting
2012-06-13Fix NPE when only front cameras are available.Angus Kong
2012-06-04Rename Camera to LegacyCamera for SDK inclusion.Eino-Ville Talvala
2012-02-18Fix the share popup. DO NOT MERGEAngus Kong
2012-02-08Import translations. DO NOT MERGEEric Fischer
2012-01-20Merge "Do not allow switching to other activities during panorama capture. (d...Wei Huang
2012-01-20Do not allow switching to other activities during panorama capture. (do not m...Wu-cheng Li
2012-01-12Allow saving panorama after the activity is paused. (do not merge)Angus Kong
2012-01-05Use default volume control stream instead of the music stream.Eino-Ville Talvala
2011-12-06Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer
2011-12-06Import revised translations. DO NOT MERGEEric Fischer
2011-12-06Fix crash after restoring defaults.Wu-cheng Li
2011-11-29Import revised translations. DO NOT MERGEEric Fischer
2011-11-28Fix NPE if the camera cannot be connected.Wu-cheng Li
2011-11-22Dismiss open menu if exists.Chung-yih Wang
2011-11-21Merge "Update camera sound API." into ics-mr1Wu-cheng Li
2011-11-21Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer
2011-11-21Import revised translations. DO NOT MERGEEric Fischer
2011-11-21Fix share popup is not aligned with viewfinder.Wu-cheng Li
2011-11-18Update camera sound API.Wu-cheng Li
2011-11-18Merge "Fix NPE in panorama when camera failed to connect." into ics-mr1Chih-yu Huang
2011-11-18Fix NPE in panorama when camera failed to connect.Chih-yu Huang
2011-11-17Merge "Fix OpenGL processing when activity is not active." into ics-mr1Angus Kong
2011-11-18Fix OpenGL processing when activity is not active.Angus Kong
2011-11-17Merge "Rotate priority indicators according to the device orientation." into ...Wei Huang
2011-11-17Rotate priority indicators according to the device orientation.Wu-cheng Li
2011-11-16Merge "Fix EffectsRecorder error path handling when ending recording." into i...Eino-Ville Talvala
2011-11-16Fix EffectsRecorder error path handling when ending recording.Eino-Ville Talvala
2011-11-16Merge "Update the panorama capturing progress correctly." into ics-mr1Wei-Ta Chen
2011-11-16Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer
2011-11-16Merge "Fix crash: camera swap w/ custom Background video" into ics-mr1Pannag Sanketi
2011-11-16Import revised translations. DO NOT MERGEEric Fischer
2011-11-16Merge "Fix the ArrayIndexOutOfBound issue." into ics-mr1Wei Huang