summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of e2c7d491 to masterandroid-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-2android-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_r1nougat-mr1-wear-releasen-iot-preview-2marshmallow-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-releasebrillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devbrillo-m7-releasebrillo-m7-mr-devbrillo-m7-devbrillo-m10-releasebrillo-m10-devNick Kralevich2015-04-011-16/+0
|\
| * Merge "Drop BOARD_SEPOLICY_UNION."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soongNick Kralevich2015-04-011-11/+0
| |\
| | * Drop BOARD_SEPOLICY_UNION.Stephen Smalley2015-04-011-11/+0
| |/
* | Add Roboto fontsRoozbeh Pournader2015-02-251-0/+1
* | am a88a78db: Merge "Remove unused property."Elliott Hughes2015-01-291-1/+0
|\|
| * Merge "Remove unused property."Elliott Hughes2015-01-291-1/+0
| |\
| | * Remove unused property.Elliott Hughes2015-01-281-1/+0
| |/
* | am 49f39f7e: Merge "Remove unneeded PRODUCT_RUNTIMES."Ying Wang2014-12-161-3/+0
|\|
| * Merge "Remove unneeded PRODUCT_RUNTIMES."Ying Wang2014-12-161-3/+0
| |\
| | * Remove unneeded PRODUCT_RUNTIMES.Ying Wang2014-12-081-3/+0
| |/
* / Fix broken build.Nick Kralevich2014-10-141-0/+5
|/
* Delete vendorsetup.sh which is used internally.android-wear-5.0.0_r1android-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-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseleozwang2014-07-091-23/+0
* Update Board config.leozwang2014-06-251-6/+23
* am 8bcf4b7a: am 9eae7669: Merge "Remove dependencies on runtime_libdvm and li...Brian Carlstrom2014-05-290-0/+0
|\
| * am 9eae7669: Merge "Remove dependencies on runtime_libdvm and libdvm.so in ge...android-l-preview_r2l-previewBrian Carlstrom2014-05-291-25/+2
| |\
| | * Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"Brian Carlstrom2014-05-291-25/+2
| | |\
| | | * Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-291-25/+2
| | |/
* | | Remove dependencies on runtime_libdvm and libdvm.so in generalBrian Carlstrom2014-05-281-25/+2
* | | Add TARGET_USERIMAGES_USE_EXT4 to armv7-a-neon.Nicholas Sauer2014-03-241-0/+9
* | | am 0efea445: am c1e9a5fe: Merge "Vibra: compile and stage vibrator.default to...David Turner2014-01-241-0/+1
|\| |
| * | am c1e9a5fe: Merge "Vibra: compile and stage vibrator.default to all \'mini\'...David Turner2014-01-231-0/+1
| |\|
| | * Merge "Vibra: compile and stage vibrator.default to all 'mini' targets"idea133-weekly-releaseDavid Turner2014-01-241-0/+1
| | |\
| | | * Vibra: compile and stage vibrator.default to all 'mini' targetsDavid Wagner2013-12-311-0/+1
| | |/
* | | am 4a17bf42: am 88caebac: Merge commit \'0923313d90f03365d3fb881c3cb6d5080294...The Android Open Source Project2013-12-060-0/+0
|\| |
| * | am 88caebac: Merge commit \'0923313d90f03365d3fb881c3cb6d50802946b6b\' into HEADThe Android Open Source Project2013-12-050-0/+0
| |\|
| | * Merge commit '0923313d90f03365d3fb881c3cb6d50802946b6b' into HEADidea133The Android Open Source Project2013-12-051-0/+1
| | |\
* | | | am 610cf57b: am 2cccd9a2: Merge "We don\'t need WPA_SUPPLICANT_VERSION in gen...Ying Wang2013-12-050-0/+0
|\| | |
| * | | am 2cccd9a2: Merge "We don\'t need WPA_SUPPLICANT_VERSION in generic build."Ying Wang2013-12-051-2/+0
| |\| | | | |/ | |/|
| | * Merge "We don't need WPA_SUPPLICANT_VERSION in generic build."Ying Wang2013-12-051-2/+0
| | |\
| | | * We don't need WPA_SUPPLICANT_VERSION in generic build.Ying Wang2013-12-051-2/+0
| | |/
* | / We don't need WPA_SUPPLICANT_VERSION in generic build.Ying Wang2013-11-251-2/+0
|/ /
* / Adding Teleservice to PDKandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-4.4w_r1android-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_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devStuart Scott2013-11-041-0/+1
|/
* Changing mini to inherit from core_base.mk.android-cts-4.4_r4android-cts-4.4_r1android-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.4_r0.7kitkat-releasekitkat-cts-releasekitkat-cts-devStuart Scott2013-08-021-1/+91
* add mini_common for putting common mini stuffskeunyoung2013-06-262-2/+18
* add missing inheritance from chromium.mkkeunyoung2013-06-251-0/+1
* am fe9703f3: Merge "Remove unused generic/armv7-a-neon ARCH_ARM_HAVE_TLS_REGI...android-4.3_r3.1android-4.3_r3android-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.9android-4.3.1_r1tools_r22.2jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devElliott Hughes2013-03-221-1/+0
|\
| * Merge "Remove unused generic/armv7-a-neon ARCH_ARM_HAVE_TLS_REGISTER."tools_r22jb-mr1.1-dev-plus-aospElliott Hughes2013-03-221-1/+0
| |\
| | * Remove unused generic/armv7-a-neon ARCH_ARM_HAVE_TLS_REGISTER.Elliott Hughes2013-03-211-1/+0
| |/
* | am 93559b81: Merge "add TARGET_CPU_VARIANT to PDK ARM target"Christopher Ferris2013-03-070-0/+0
|\|
| * Merge "add TARGET_CPU_VARIANT to PDK ARM target"Christopher Ferris2013-03-081-0/+1
| |\
| | * add TARGET_CPU_VARIANT to PDK ARM targetkeunyoung2013-03-071-0/+1
| |/
* / add TARGET_CPU_VARIANT to PDK ARM targetkeunyoung2013-03-051-0/+1
|/
* disable lockscreen by defaultandroid-sdk-support_r11android-cts-4.2_r2android-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_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devKeun young Park2012-08-221-0/+22
* define BOARD_USE_LEGACY_UI for PDK buildKeun young Park2012-08-221-0/+2
* Add support for per device bluetooth configuration.Wink Saville2012-08-201-0/+1
* enable OPENGL_RENDERER by defaultKeun young Park2012-08-141-0/+2
* Merge "Fix build - Add TARGET_ARCH := arm"tools_r21Jean-Baptiste Queru2012-08-101-0/+1
|\
| * Fix build - Add TARGET_ARCH := armJean-Baptiste Queru2012-08-101-0/+1
|/
* fix PDK build: use WPA_SUPPLICANT v8 instead of v6android-cts-4.1_r4android-cts-4.1_r2android-cts-4.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-mr0-releasejb-devKeun young Park2012-06-111-0/+2
* mini_armv7a_neon configuration for PDKKeun young Park2012-06-066-0/+154