summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 4448085 from 1f952d03024aacc2f0f2762d61704bbc5eeb04bb to oc-m3-releaseandroid-8.1.0_r9android-8.1.0_r7android-8.1.0_r22android-8.1.0_r21android-8.1.0_r18android-8.1.0_r17android-8.1.0_r14android-8.1.0_r13oreo-m5-releaseoreo-m3-releaseandroid-build-team Robot2017-11-290-0/+0
|\
| * Snap for 4373604 from f59b218200353f08bd3c6f16c091f457c6d7d034 to oc-mr1-releaseandroid-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_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-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_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-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_r81android-8.1.0_r80android-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_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-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-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-releaseandroid-build-team Robot2017-10-030-0/+0
|/|
| * Merge "Fix a small bug in Log.h in LegacyCamera jni" am: a26fc3fd03 am: eb4ab...oreo-mr1-devZhizhou Yang2017-07-120-0/+0
|/|
| * Merge "Fix a small bug in Log.h in LegacyCamera jni" am: a26fc3fd03 am: eb4ab...Zhizhou Yang2017-07-120-0/+0
|/|
| * Merge "Fix a small bug in Log.h in LegacyCamera jni" am: a26fc3fd03Zhizhou Yang2017-07-120-0/+0
|/|
| * Merge "Fix a small bug in Log.h in LegacyCamera jni"Zhizhou Yang2017-07-120-0/+0
|/|
| * Merge "Fix a small bug in Log.h in LegacyCamera jni"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Treehugger Robot2017-07-121-1/+1
| |\
| | * Fix a small bug in Log.h in LegacyCamera jniZhizhou Yang2017-07-111-1/+1
| |/
* | Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed...android-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-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-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_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-releasePaul Duffin2017-01-181-0/+1
|\|
| * Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed...android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Paul Duffin2017-01-181-0/+1
| |\
| | * Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed1Paul Duffin2017-01-181-0/+1
| |/|
| | * Merge "Prepare for removal of legacy-test from default targets"Paul Duffin2017-01-181-0/+1
| |/|
| | * Merge "Prepare for removal of legacy-test from default targets"android-o-preview-1android-n-mr2-preview-2o-previewTreehugger Robot2017-01-181-0/+1
| |/|
| | * Prepare for removal of legacy-test from default targetsPaul Duffin2017-01-171-0/+1
| |/
* | Fixed header guard typoMichael Butler2016-08-291-1/+1
* | Merge \\\\"Fix misc-macro-parentheses warnings in LegacyCamera.\\\\" am: 0230...Chih-hung Hsieh2016-07-262-18/+18
|\|
| * Merge \\\"Fix misc-macro-parentheses warnings in LegacyCamera.\\\" am: 02301d...android-n-mr2-preview-1Chih-Hung Hsieh2016-07-262-18/+18
| |\
| | * Merge \\"Fix misc-macro-parentheses warnings in LegacyCamera.\\" am: 02301db045Chih-hung Hsieh2016-07-262-18/+18
| | |\
| | | * Merge \"Fix misc-macro-parentheses warnings in LegacyCamera.\"android-n-mr1-preview-2android-n-mr1-preview-1Chih-Hung Hsieh2016-07-262-18/+18
| | |/|
| | | * Merge "Fix misc-macro-parentheses warnings in LegacyCamera."Chih-hung Hsieh2016-07-262-18/+18
| | | |\
| | | | * Fix misc-macro-parentheses warnings in LegacyCamera.Chih-Hung Hsieh2016-06-292-18/+18
| | | |/
* | | | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20 am...Chih-Hung Hsieh2016-05-241-1/+1
|\| | |
| * | | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20Chih-Hung Hsieh2016-05-241-1/+1
| |\| |
| | * | Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69Chih-Hung Hsieh2016-05-241-1/+1
| | |\ \
| | | * | Merge "Fix misc-macro-parentheses warnings."Chih-Hung Hsieh2016-05-241-1/+1
| | | |\|
| | | | * Merge "Fix misc-macro-parentheses warnings."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Treehugger Robot2016-05-241-1/+1
| | | |/|
| | | | * Fix misc-macro-parentheses warnings.Chih-Hung Hsieh2016-05-121-1/+1
| | | |/
* | | / Prevent camera app crashes on changing hw.camera.* settings am: 996546fcf4 am...Lingfeng Yang2016-05-031-2/+15
|\| | | | |_|/ |/| |
| * | Prevent camera app crashes on changing hw.camera.* settings am: 996546fcf4Lingfeng Yang2016-05-031-2/+15
|/| | | |/
| * Prevent camera app crashes on changing hw.camera.* settingsandroid-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-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_r1nougat-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-dr1-releaseLingfeng Yang2016-05-031-2/+15
|/|
| * Prevent camera app crashes on changing hw.camera.* settingsandroid-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-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_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releaseLingfeng Yang2016-04-271-2/+15
|/
* am 33e28809: Merge "Add missing <string.h> include."android-wear-n-preview-1android-n-preview-3android-n-preview-2android-n-preview-1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseElliott Hughes2015-01-261-0/+2
|\
| * Merge "Add missing <string.h> include."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soongElliott Hughes2015-01-261-0/+2
| |\
| | * Add missing <string.h> include.Elliott Hughes2015-01-261-0/+2
| |/
* | am e48f3382: Merge "Use and older standard version."Dan Albert2014-11-201-0/+1
|\|
| * Merge "Use and older standard version."android-wear-5.0.0_r1lollipop-wear-releaseDan Albert2014-11-201-0/+1
| |\
| | * Use and older standard version.Dan Albert2014-11-201-0/+1
| |/
* | am 090283cf: (-s ours) Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-210-0/+0
|\|
| * Remove 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 Uddin2014-07-191-199/+0
* | Remove deprecated localesBaligh Uddin2014-07-171-199/+0
|/
* am d9b5d894: Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."Ying Wang2014-04-210-0/+0
|\
| * Merge "Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."android-l-preview_r2l-previewidea133-weekly-releaseYing Wang2014-04-181-2/+0
| |\
| | * Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-181-2/+0
| |/
* | Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-171-2/+0
* | am 8e944e63: Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
|\|
| * Merge "Loading the corresponding library in LegacyCamera app"Glenn Kasten2014-01-071-1/+1
| |\
| | * Loading the corresponding library in LegacyCamera appJun Tian2013-08-061-1/+1
* | | am be2086de: Merge "Fix the loading library issue of panorama mode in Legacyc...Glenn Kasten2014-01-071-1/+1
|\| |
| * | Merge "Fix the loading library issue of panorama mode in Legacycamera app"Glenn Kasten2014-01-071-1/+1
| |\ \ | | |/ | |/|
| | * Fix the loading library issue of panorama mode in Legacycamera appJun Tian2013-07-041-1/+1
| |/