summaryrefslogtreecommitdiffstats
path: root/sdk
Commit message (Expand)AuthorAgeFilesLines
* Update Build Tools version to <API>.0.2. DO NOT MERGE.Xavier Ducrohet2014-10-211-1/+1
* Update Build Tools version to <API>.0.1. DO NOT MERGE.Xavier Ducrohet2014-10-171-1/+1
* Update LayoutLib API level to 12.Deepanshu Gupta2014-10-061-1/+1
* Prepare the SDK component version numbers.Xavier Ducrohet2014-09-222-4/+2
* Update revision of Android SDK USB driver for WindowsSiva Velusamy2014-09-151-1/+1
* am ad42c9e9: Proper resolution of conflict for 8062092aJi-Hwan Lee2014-06-231-3/+1
|\
| * Proper resolution of conflict for 8062092aJi-Hwan Lee2014-06-231-3/+1
* | am 767f57dc: resolved conflicts for 8062092aEd Heyl2014-06-211-1/+3
|\|
| * resolved conflicts for 8062092aEd Heyl2014-06-211-1/+3
| |\
| | * Update revision of Android SDK USB driver for Windows. DO NOT MERGE.Raphael Moll2014-06-201-1/+1
* | | am 44602376: Merge "RC version for build-tools." into lmp-preview-devXavier Ducrohet2014-06-171-1/+3
|\ \ \ | |/ / |/| |
| * | Merge "RC version for build-tools." into lmp-preview-devXavier Ducrohet2014-06-162-2/+4
| |\ \
| | * | RC version for build-tools.Xavier Ducrohet2014-06-162-2/+4
| * | | Move SDK system-image source.prop_templates in their own folder.Raphael Moll2014-06-146-53/+0
| |/ /
| * | am f7863319: am 261307be: resolved conflicts for merge of bf164835 to stage-a...Raphael Moll2014-05-211-0/+13901
| |\ \
| * | | Ability to generate SDK system-images for arm64 and x86_64Raphael Moll2014-05-193-1/+19
| * | | am 7401fa16: am 8aa49aef: am f9f829e5: Merge "SDK: support generating reposit...Raphael Moll2014-05-165-2/+9
| |\ \ \
| * | | | Update revision of Android SDK USB driver for Windows. DO NOT MERGE.Raphael Moll2014-01-301-1/+1
| * | | | am 51fa6c5c: am aa198e6c: am 3519ce6e: Adjust SDK revisions for KLP MR1 for p...Raphael Moll2013-12-051-1/+1
| |\ \ \ \
* | \ \ \ \ am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."Raphael Moll2014-06-091-50961/+0
|\ \ \ \ \ \
| * | | | | | Generate api-versions.xml for lint.Raphael Moll2014-06-091-50961/+0
* | | | | | | am 95671f78: am 03afa4d6: Merge "Android USB driver: support 4EE7 (Nexus adb ...Raphael Moll2014-06-061-1/+1
|\| | | | | |
| * | | | | | Android USB driver: support 4EE7 (Nexus adb only).Raphael Moll2014-06-061-1/+1
* | | | | | | am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates ...Raphael Moll2014-06-046-53/+0
|\| | | | | |
| * | | | | | Move SDK system-image source.prop_templates in their own folder.Raphael Moll2014-06-036-53/+0
* | | | | | | am 728f321c: Merge "Add Build-Tools runtime.properties file."Raphael Moll2014-06-041-0/+2
|\| | | | | |
| * | | | | | Add Build-Tools runtime.properties file.Raphael Moll2014-06-031-0/+2
* | | | | | | am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for ar...Raphael Moll2014-05-283-1/+19
|\| | | | | |
| * | | | | | am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"Raphael Moll2014-05-283-1/+19
| |\ \ \ \ \ \
| | * | | | | | Ability to generate SDK system-images for arm64 and x86_64Raphael Moll2014-05-273-1/+19
* | | | | | | | am f8a99a45: Reset version number to .0.0 for new API level SDK.Xavier Ducrohet2014-05-229-9/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Reset version number to .0.0 for new API level SDK.Xavier Ducrohet2014-05-229-9/+9
* | | | | | | am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-masterRaphael Moll2014-05-201-0/+13901
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | resolved conflicts for merge of bf164835 to stage-aosp-masterRaphael Moll2014-05-201-0/+13901
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix SDK build.Raphael Moll2014-05-201-0/+13901
* | | | | | am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with ...Raphael Moll2014-05-165-2/+9
|\| | | | |
| * | | | | am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."Raphael Moll2014-05-165-2/+9
| |\| | | |
| | * | | | SDK: support generating repository XML with latest XSD.Raphael Moll2014-05-155-2/+9
| * | | | | am 56142356: Merge "Update revision of Android SDK USB driver for Windows."Raphael Moll2014-03-061-1/+1
| |\| | | |
* | | | | | am 4c3d9d23: am 26b61880: Move support lib to 19.2.0. Do not merge.Xavier Ducrohet2014-04-111-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Move support lib to 19.2.0. Do not merge.Xavier Ducrohet2014-04-101-1/+1
* | | | | | am de76aab8: am f03f35fe: Update support library version to 19.1.0.Raphael Moll2014-03-261-1/+1
|\| | | | |
| * | | | | Update support library version to 19.1.0.Raphael Moll2014-03-261-1/+1
| |/ / / /
* | | | | am 56142356: Merge "Update revision of Android SDK USB driver for Windows."Raphael Moll2014-01-311-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Update revision of Android SDK USB driver for Windows.Raphael Moll2014-01-301-1/+1
* | | | Update build tools to 19.0.2Xavier Ducrohet2014-01-021-1/+1
| |_|/ |/| |
* | | Adjust SDK revisions for KLP MR1 for platform and samplesRaphael Moll2013-11-271-1/+1
* | | Merge "Prepare SDK for KLP MR1. Do not merge." into klp-devXavier Ducrohet2013-11-268-8/+8
|\ \ \ | |_|/ |/| |
| * | Prepare SDK for KLP MR1. Do not merge.Raphael Moll2013-11-158-8/+8
| |/
* / Update api-versions.xml for latest API changesTor Norbye2013-11-201-3/+2
|/