summaryrefslogtreecommitdiffstats
path: root/target
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 51de6437 to honeycomb-plus-aospEd Heyl2011-03-052-0/+29
|\
| * Merge "x86: sdk_x86 build target"David Turner2011-03-042-0/+29
| |\
| | * x86: sdk_x86 build targetBruce Beare2011-03-012-0/+29
* | | am dfa82c43: am faa68200: Merge "x86: Add in the VirtualBox emulator as a sep...David Turner2011-03-059-0/+612
|\ \ \ | |/ /
| * | Merge "x86: Add in the VirtualBox emulator as a separate build target"David Turner2011-03-049-0/+612
| |\ \ | | |/
| | * x86: Add in the VirtualBox emulator as a separate build targetBruce Beare2011-03-019-0/+612
* | | am 1fe8c892: am 65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/...Ying Wang2011-03-021-3/+0
|\ \ \
| * \ \ am 65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mkYing Wang2011-03-011-3/+0
| |\ \ \
| | * | | Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mkYing Wang2011-03-011-3/+0
| | * | | Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-301-3/+7
| | |\ \ \
| | | * \ \ am 54a6b731: Merge "Flesh out the languages_full list with recently added loc...Eric Fischer2011-01-291-3/+7
| | | |\ \ \
* | | | \ \ \ am 6d85b7c7: am 243d9ae2: am 4d67e916: am d09b2e55: Merge "WAPPushManager, WA...Wink Saville2011-03-021-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 243d9ae2: am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over S...Wink Saville2011-03-011-1/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"Wink Saville2011-03-011-1/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge "WAPPushManager, WAP Push over SMS message handler"Wink Saville2011-02-231-1/+2
| | | |\ \ \ \
| | | | * | | | WAPPushManager, WAP Push over SMS message handlernoda2011-01-071-1/+2
* | | | | | | | Add Exchange to build targetsMarc Blank2011-02-253-0/+3
* | | | | | | | Fix generic_x86 image sizes.Ying Wang2011-02-091-3/+3
* | | | | | | | Add system image size for X86Kenny Root2011-02-081-0/+1
* | | | | | | | Fix x86 build.Jean-Baptiste Queru2011-02-032-3/+3
* | | | | | | | am ef7c96c9: am d3966412: am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to k...Jean-Baptiste Queru2011-01-291-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am d3966412: am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync w...Jean-Baptiste Queru2011-01-291-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init...Jean-Baptiste Queru2011-01-271-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Add dnsproxyd to keep in sync with base init.rcBruce Beare2011-01-271-0/+1
| | | |/ / / /
* | | | | | | am 75e557d1: am b6c2b1c6: Fix SDK connectivity.Robert Greenwalt2011-01-241-2/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b6c2b1c6: Fix SDK connectivity.Robert Greenwalt2011-01-241-2/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Fix SDK connectivity.Robert Greenwalt2011-01-241-2/+1
| | | |_|/ / | | |/| | |
* | | | | | make TINY_ANDROID build without the presence of frameworks/* and development/*Brian Swetland2011-01-231-6/+6
* | | | | | am e6e583ff: am 7dfc1270: am 54a6b731: Merge "Flesh out the languages_full li...Eric Fischer2011-01-211-3/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7dfc1270: am 54a6b731: Merge "Flesh out the languages_full list with recen...Eric Fischer2011-01-211-3/+7
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | am 54a6b731: Merge "Flesh out the languages_full list with recently added loc...Eric Fischer2011-01-181-3/+7
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Flesh out the languages_full list with recently added locales.Eric Fischer2011-01-141-3/+7
* | | | am 04a4d9ad: am 04e1f31d: Move videoeditor libraries to generic_no_telephony.mk.Ying Wang2011-01-192-5/+6
|\ \ \ \ | |/ / /
| * | | Move videoeditor libraries to generic_no_telephony.mk.Ying Wang2011-01-192-5/+6
* | | | am 155776bf: am a17fe58b: Update SDK app list.Xavier Ducrohet2011-01-181-15/+16
|\ \ \ \ | |/ / /
| * | | Update SDK app list.Xavier Ducrohet2011-01-181-15/+16
* | | | am 0e581c25: am aafe93b1: Merge "Add librs_jni to the sdk product packages." ...Xavier Ducrohet2011-01-181-1/+2
|\ \ \ \ | |/ / /
| * | | Add librs_jni to the sdk product packages.Xavier Ducrohet2011-01-171-1/+2
* | | | am fd5aca8b: am c86bcf5f: Merge "add videoeditor libraries to make" into hone...Dharmaray Kundargi2011-01-171-1/+4
|\ \ \ \ | |/ / /
| * | | Merge "add videoeditor libraries to make" into honeycombDharmaray Kundargi2011-01-171-1/+4
| |\ \ \
| | * | | add videoeditor libraries to makeDharmaray Kundargi2011-01-161-1/+4
* | | | | am 665aefdd: am 1fa29fc9: Merge "Add librs_jni to the generic product package...David 'Digit' Turner2011-01-161-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Add librs_jni to the generic product packages.David 'Digit' Turner2011-01-171-0/+3
| |/ / /
* | | | Move apache-xml to external. (project 3 of 4)Jesse Wilson2011-01-131-0/+1
|/ / /
* | | Add the CryptKeeper to the build.Jason parks2011-01-051-1/+2
* | | am 41c423da: am 96d3e9b3: Merge "generic_x86 builds don\'t need/use the spars...Jean-Baptiste Queru2010-12-291-0/+1
|\ \ \ | |/ /
| * | generic_x86 builds don't need/use the sparse ext4 format.Bruce Beare2010-12-281-0/+1
* | | am 827c662d: am e28ae87a: Merge "Use ext4 file system for generic_x86 userdat...Jean-Baptiste Queru2010-12-291-1/+3
|\ \ \ | |/ /
| * | Use ext4 file system for generic_x86 userdata partitionBruce Beare2010-12-281-1/+3
* | | am 4bd05717: am 670ccf2c: Merge "GB Updates for init.rc and boot command line"Jean-Baptiste Queru2010-12-293-46/+74
|\ \ \ | |/ /