summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 5b93afd7fc -s oursXin Li
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
2021-09-22Handle MediaMetadataRetriever.release IOExceptionSantiago Seifert
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: efe429...Xin Li
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: efe429...Xin Li
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: efe429...Xin Li
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: efe429...Xin Li
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
2021-08-05Camera: Remove possible duplicate filmstrip itemsEmilian Peev
2021-06-09Merge "Convert Camera2/jni/Android.mk to Android.bp" am: 85a5b51324 am: 23ede...Yuntao Xu
2021-06-09Merge "Convert Camera2/jni/Android.mk to Android.bp" am: 85a5b51324 am: 23ede...Yuntao Xu
2021-06-09Merge "Convert Camera2/jni/Android.mk to Android.bp" am: 85a5b51324 am: 23ede...Yuntao Xu
2021-06-09Merge "Convert Camera2/jni/Android.mk to Android.bp" am: 85a5b51324android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Yuntao Xu
2021-06-09Merge "Convert Camera2/jni/Android.mk to Android.bp"Yuntao Xu
2021-05-17Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ...Treehugger Robot
2021-05-17Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ...Treehugger Robot
2021-05-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: df29d3b494...Treehugger Robot
2021-05-15Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ...Treehugger Robot
2021-05-07Convert Camera2/jni/Android.mk to Android.bpYuntao Xu
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ...Treehugger Robot
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ...Treehugger Robot
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ...Treehugger Robot
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ...Treehugger Robot
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ...android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devTreehugger Robot
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ...Treehugger Robot
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3Treehugger Robot
2021-04-29Merge "Camera2: Migrate recording path to scoped storage"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-29Camera2: Migrate recording path to scoped storageShuzhen Wang
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: df29d3b494...Treehugger Robot
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: df29d3b494...Treehugger Robot
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: df29d3b494...Treehugger Robot
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: df29d3b494...Treehugger Robot
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: df29d3b494Treehugger Robot
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2"Treehugger Robot
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2Bob Badour
2021-03-15Merge "Add <uses-library> information." am: e0b1380c2b am: f5f9ea7752 am: 93b...Treehugger Robot
2021-03-15Merge "Add <uses-library> information." am: e0b1380c2b am: f5f9ea7752 am: 93b...Treehugger Robot
2021-03-15Merge "Add <uses-library> information." am: e0b1380c2b am: f5f9ea7752Treehugger Robot
2021-03-15Merge "Add <uses-library> information." am: e0b1380c2bTreehugger Robot
2021-03-15Merge "Add <uses-library> information."Treehugger Robot
2021-03-11Add <uses-library> information.Ulya Trafimovich
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3707cc57b -s ou...Xin Li
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: dc05b79521...Bob Badour
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3707cc57b -s ou...Xin Li
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: dc05b79521...Bob Badour
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3707cc57b -s oursXin Li
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: dc05b79521...Bob Badour
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: dc05b79521Bob Badour