aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-15Merge "Convert Android.mk to Android.bp." am: b0b6ab038cSasha Smundak
am: c68c18b32a Change-Id: I4061689715a4f54846655080e52b70c3d2e0c0c9
2019-01-15Merge "Convert Android.mk to Android.bp."Sasha Smundak
am: b0b6ab038c Change-Id: I1138e1742cf7c95edce9f5bb4bdb2ce3ba977d07
2019-01-15Merge "Convert Android.mk to Android.bp."Treehugger Robot
2019-01-10gitignore: Fix regex for local.properties am: 66dee72aafFelix
am: b5abc3b6c8 Change-Id: I4ee0ccc8f6ca72b8333528e34922f7b976e87650
2019-01-10gitignore: Fix regex for local.propertiesFelix
am: 66dee72aaf Change-Id: Id0f99a04c53fa1ac808cb185ef9e202a2e3d8355
2019-01-08Convert Android.mk to Android.bp.Sasha Smundak
See build/soong/README.md for more information Change-Id: I7fd844f966e73deffff3eb355ac06f0afc519b78 Fixes: 122331935 Test: treehugger
2019-01-05gitignore: Fix regex for local.propertiesFelix
This stops e.g. ripgrep from tripping over this malformed regex and spewing errors. Test: Create local.properties in glide root folder: Ignored Create local.properties in library subfolder: Ignored Change-Id: Iafdcbb442842615cb3926e2da2b8ef028f46d7c1 Signed-off-by: Felix <google@ix5.org>
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 371485f971 -s ours am: 9062a55dd4 -s ours Change-Id: I83146e2b7399ad2976a738a6a839d0a3757c5ff5
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 371485f971 -s ours Change-Id: I4f0605d0d86c6f85c62f302b30ff774c34a956d6
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: Ibcab8d405d072baf3270cf9e548052f4e78f25e7
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 5f30fc9ea0 -s ours Change-Id: I96b9306576ba0a00cc05883dcf16ff4292663483
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I00204ddc151c664afa8d1345cd2495b5ff97fbed
2018-10-03Remove all submodules. am: 0e1dca2f26Jaewoong Jung
am: b555a3530e Change-Id: I5b2d96202bbe4482ce3946a5e3a4e7703c7080b4
2018-10-03Remove all submodules.Jaewoong Jung
am: 0e1dca2f26 Change-Id: Ic8783e578e42b10bf1175e0cb541677f729e5f67
2018-09-27Remove all submodules.android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseJaewoong Jung
Submodules are not supported by the current Android platfrom development tool chain, so only make git do extra work. Even worse, misconfigured submodules that break git-based workflows can be submitted without triggering a presubmit failure. Test: TreeHugger Issue: 109878533 Change-Id: Ic49a73c4f6aa8e4d16a3413194d7b93dd2f5df3a
2018-08-07Merge Android Pie into master am: b6005ef573 am: f35128f042Xin Li
am: c548684ddc Change-Id: Ia9f7cce7090befa1929c54e018a502a12033a91e
2018-08-07Merge Android Pie into master am: b6005ef573Xin Li
am: f35128f042 Change-Id: Ib0ed51ddab2af847bce13282c53b97d13066c204
2018-08-07Merge Android Pie into masterXin Li
am: b6005ef573 Change-Id: I5f5d39dbb4c04352c07637f4855fc62c868cb8db
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3Xin Li
Bug: 112104996 Change-Id: I4d936c46e75b21b0c0982b70a0b8e77f4b379d3e
2018-07-06Add METADATA for glide am: 0737ddc95fHaibo Huang
am: 596c7d8557 Change-Id: I74cac5578cf5da33612ac4fa1502f4d7887c3361
2018-07-06Add METADATA for glidetemp_p_mergeHaibo Huang
am: 0737ddc95f Change-Id: I9831daf9331c6522ac2b5d3898f9dc068b930073
2018-07-06Add METADATA for glideandroid-p-preview-5android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-display-r2Haibo Huang
Test: NA Change-Id: Id8deeed93bb9e074f5fecaac10f6884d18cc83a2
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: c7e3b6269b Change-Id: Ic315c14e1513f6a43bbca825e9410ecd764c38fc
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: Ibce3628baa7d6b322d9224f6f4bac68e4fe9bfbb
2018-03-25Snap for 4677756 from d2cbf371e573ceae7cd2615df9f07da79c75a585 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I975a03609688c316bb0ee6e62124e6cf5602b769
2018-03-24DO NOT MERGE Fix Glide to build against latest Support LibrariesAlan Viverette
am: d2cbf371e5 Change-Id: Ifeb77990720a2995d22827158150db5fb34aa9fa
2018-03-24DO NOT MERGE Fix Glide to build against latest Support Librariesandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devAlan Viverette
Bug: 73250914 Test: make && make cts Change-Id: Iac89b8ed2f95ba283b62365307b540e39d7c8e6f
2017-12-20Snap for 4510491 from e7119729a1ff579ecd7dff07b7e59de6a7b16e62 to pi-releaseandroid-build-team Robot
Change-Id: I15185f816f68da7ee7ed36b70efed471b54dbccc
2017-12-19Add metadata am: de59552097 am: 8f5ebd9c32Bill Yi
am: 2c0f7613cb Change-Id: I350c47320ceb82a5c50de6af94bb924ceba5d086
2017-12-19Add metadata am: de59552097Bill Yi
am: 8f5ebd9c32 Change-Id: Icecc3a6015ff6402e31450a1396fe3b7c6611e89
2017-12-19Add metadataBill Yi
am: de59552097 Change-Id: I9aeabbf68fa519f0e503d9b7bcfc4b1e53e83cc8
2017-12-12Snap for 4498106 from 3fba2c44ddd4165a81fe19b891e71464915db01d to pi-releaseandroid-build-team Robot
Change-Id: Id0933bf630b9b3dbe13e030d2e7d52aebb81adbc
2017-12-11Move glide over to new SL libs, aapt2Alan Viverette
Test: make Bug: 35994894 Change-Id: I2c21def3e8cf78a9b2590a0a1e5676ff69c02e63
2017-12-07Add metadataandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Bill Yi
BUG:67772237 Change-Id: I1ef43793fb1a454314c6e37c0621ee488bd2f7b1
2017-10-18Snap for 4402171 from 76aa0c2d39104d1f116911072806c38c76a742c6 to pi-releaseandroid-build-team Robot
Change-Id: I4cc46ce81c6e4b312000ccf2015ca4ebdaea848b
2017-10-17Rename getLifecycle into getGlideLifecycle. am: ae9934f693 am: 7c7d8e9147sergeyv
am: ea5ad2fbbe Change-Id: I1fd76838b00bba27868462d20004fde40ff9c48b
2017-10-17Rename getLifecycle into getGlideLifecycle. am: ae9934f693sergeyv
am: 7c7d8e9147 Change-Id: If8c87479f9ae27d55d2ac236b10acaa9e5d0e827
2017-10-17Rename getLifecycle into getGlideLifecycle.sergeyv
am: ae9934f693 Change-Id: If123605a03be4bcac9bd240554256b83339361ff
2017-10-17Rename getLifecycle into getGlideLifecycle.android-o-mr1-iot-preview-6o-mr1-iot-preview-6sergeyv
"getLifecycle()" will be added to fragments from support library in 26*, to avoid name conflicts getLifecycle in requestManagerFragment is renamed. The same fix was applied to latest versions (4.* and 3.9.* of glide) Change-Id: Iaeed31db2005ff168b3f7c4bf466a5af5dba79df (cherry picked from commit ef6d5767ed0a888ac27e29a28684f0e1bcb9708a)
2017-06-26Rename getLifecycle into getGlideLifecycle.oreo-mr1-devsergeyv
"getLifecycle()" will be added to fragments from support library in 26*, to avoid name conflicts getLifecycle in requestManagerFragment is renamed. The same fix was applied to latest versions (4.* and 3.9.* of glide) Change-Id: Iaeed31db2005ff168b3f7c4bf466a5af5dba79df
2015-05-15am acf91e46: am ce1d390f: keep history after reset to ub-camera-haleakalaandroid-wear-o-preview-4android-wear-o-preview-3android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-mr1-preview-2android-o-mr1-preview-1android-o-iot-preview-5android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-preview-4android-cts_7.1_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseo-previewo-iot-preview-5nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releasen-iot-preview-4Alex Cheung
* commit 'acf91e463acf613ddef2e6e6bb68f5d92665f305':
2015-05-15am ce1d390f: keep history after reset to ub-camera-haleakalaandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Alex Cheung
* commit 'ce1d390fbf0d4cad74dacdc55c0f6b1f98ae5cb1':
2015-05-15am 95e5bc58: keep history after reset to ub-camera-haleakalaAlex Cheung
* commit '95e5bc585d1247b8f5a4124c4f6571b38a25cd3d':
2015-05-15keep history after reset to ub-camera-haleakalaAlex Cheung
2015-05-15am 5fa77ef0: am b4b82b7e: am ac008b79: keep history after reset to ↵Alex Cheung
ub-camera-haleakala * commit '5fa77ef0dcac04b2f3ef4de25c895ea972be59d3':
2015-05-15am 4496b81c: am d9f89c5d: Merge branch \'mnc-ub-dev\' of ↵Chris Banes
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-ub-dev * commit '4496b81c23dbd3a7df732e00713fed93707620f5':
2015-05-15am 7c4f6305: Merge branch \'mnc-dev-plus-aosp\' of ↵Zhijun He
https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-dev-plus-aosp * commit '7c4f630577f06f7f55edf07698f0578e0266f782':
2015-05-15keep history after reset to ub-camera-haleakalaandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devAlex Cheung
2015-05-15keep history after reset to ub-camera-haleakalaAlex Cheung
2015-05-15am b4b82b7e: am ac008b79: keep history after reset to ub-camera-haleakalaAlex Cheung
* commit 'b4b82b7eca1c854469ff2e0e666f7418d946d4b0':
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 21:40:21 +0000