summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-240-0/+0
|\
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| |\
* | | Convert Android.mk file to Android.bpSasha Smundak2019-01-152-35/+35
* | | Merge "Snap to commit 34b45df0f10d1a0043274d367ef643e80457950b"Glenn Kasten2018-12-1277-742/+3711
|\ \ \
| * | | Snap to commit 34b45df0f10d1a0043274d367ef643e80457950bGlenn Kasten2018-12-1177-742/+3711
* | | | [automerger skipped] DO NOT MERGE am: 26a4ca7747 -s ours am: d7442e3a61 -s ...Xin Li2018-12-100-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | [automerger skipped] DO NOT MERGE am: 26a4ca7747 -s oursXin Li2018-12-100-0/+0
| |\|
| | * [automerger skipped] DO NOT MERGEXin Li2018-12-100-0/+0
| | |\
| | | * DO NOT MERGEandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseXin Li2018-12-070-0/+0
| | |/|
| | | * Snap for 4598635 from 5156a6f8282f7d85f879a6b9c5db31f85840fcf0 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_r3android-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_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-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_r2android-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_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 Robot2018-02-111-5/+3
| | | |\
| | | * \ Snap for 4565898 from 97d5dc4963c9d74c02bd956188428226578d1867 to pi-releaseandroid-build-team Robot2018-01-251-0/+1
| | | |\ \
| | | * \ \ Snap for 4496165 from 324c62ea2d053d24a9f0badec146ef42cb6d2927 to pi-releaseandroid-build-team Robot2017-12-112-0/+202
| | | |\ \ \
* | | | | | | Merge Android Pie into master am: e386c6f698 am: 3d744ca777 am: 680577898bXin Li2018-08-080-0/+0
|\| | | | | |
| * | | | | | Merge Android Pie into master am: e386c6f698 am: 3d744ca777Xin Li2018-08-070-0/+0
| |\| | | | |
| | * | | | | Merge Android Pie into master am: e386c6f698android-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-r4android-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-fcsXin Li2018-08-070-0/+0
| |/| | | | |
| | * | | | | Merge Android Pie into masterXin Li2018-08-070-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li2018-08-061-0/+1
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: b715f9f880Xin Li2018-06-090-0/+0
|\| | | | | | |
| * | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-090-0/+0
| |\| | | | | |
| | * | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-081-0/+1
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | Migrated various apps under external/drrickorang/LoopbackApp/app/src/main to ...vineel sadineni2018-05-182-3/+3
* | | | | | | | [automerger skipped] Migrate to AAPT2 am: 57e41657aa am: 06e7c5b659 -s oursAlan Viverette2018-05-070-0/+0
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | [automerger skipped] Migrate to AAPT2 am: 57e41657aaAlan Viverette2018-05-070-0/+0
|/| | | | | | | |/ / / / /
| * | | | | Migrate to AAPT2Alan Viverette2018-05-071-5/+3
| |\| | | |
| | * | | | Migrate to AAPT2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1Alan Viverette2018-04-251-5/+3
* | | | | | Migrate to AAPT2android-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 Viverette2018-02-081-5/+3
| |_|_|_|/ |/| | | |
* | | | | Fix issue #72116995: Add permission guarding Service#startForegroundDianne Hackborn2018-01-191-0/+1
| |_|_|/ |/| | |
* | | | Add metadata am: 5ea28e9b46 am: 8a16b92dadBill Yi2017-12-082-0/+202
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add metadata am: 5ea28e9b46Bill Yi2017-12-082-0/+202
|/| | | | |/ /
| * / Add metadataBill Yi2017-12-082-0/+202
|/| | | |/
| * Add metadataandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Bill Yi2017-12-072-0/+202
|/
* Merge remote-tracking branch 'origin/upstream-master'android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseBill Rassieur2017-06-1495-0/+13778
|\
| * Merge remote-tracking branch 'origin/upstream-master'android-o-mr1-preview-2android-o-mr1-preview-1Bill Rassieur2017-06-1095-0/+13778
|/|
| * Add privacy policyGlenn Kasten2017-05-221-0/+8
| * Version 19Glenn Kasten2017-05-2212-78/+202
| * Version 17Glenn Kasten2017-02-2818-97/+587
| * Version 15Glenn Kasten2016-08-0419-296/+548
| * Version 14Glenn Kasten2016-06-028-233/+384
| * Update metafilesGlenn Kasten2016-05-316-137/+24
| * Version 12Glenn Kasten2016-04-198-14/+35
| * Version 11Glenn Kasten2016-03-251-2/+2
| * Snap to commit 5daae470b620e4779de52cb734d9bffad1ae3a7fGlenn Kasten2016-03-254-14/+55
| * Snap to commit d5cc4bf4ebe772b0de598f8e456ac7a33d41fde7Glenn Kasten2016-03-1841-403/+2223
| * Update app.imlGlenn Kasten2016-02-091-0/+8
| * Snap to commit 59d4f38aeaca9c4526b09b9fa9363ed7bcaf9fc9Glenn Kasten2016-02-0946-873/+1789
| * Upgrade to Android Studio 2.0 preview 2Glenn Kasten2015-12-091-14/+1
| * Update to version 8Glenn Kasten2015-12-091-2/+2
| * Merge pull request #14 from ragomusic/threshold_fixgkasten2015-10-162-4/+17
| |\
| | * Added energy threshold to correlation/noise gate to improve confidence level....rago2015-10-152-4/+17
| |/
| * Merge pull request #13 from dturner/mastergkasten2015-10-0616-187/+108
| |\