aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't recursively make when calling create_all_symlinks.sh from a makefile.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_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.7android-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-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devYing Wang2013-08-263-20/+20
* am 6da9a761: Merge "Update template location for SDK build"Josiah Gaskin2013-07-31273-6436/+4
|\
| * Merge "Update template location for SDK build"Josiah Gaskin2013-08-01273-6436/+4
| |\
| | * Update template location for SDK buildJosiah Gaskin2013-07-31273-6436/+4
| |/
* | am be3b71eb: Merge "Change references from sdktestutils -> testutils"Siva Velusamy2013-07-293-3/+3
|\|
| * Merge "Change references from sdktestutils -> testutils"Siva Velusamy2013-07-293-3/+3
| |\
| | * Change references from sdktestutils -> testutilsSiva Velusamy2013-07-293-3/+3
* | | am f3993f84: Merge "Rename sdktestutils -> testutils"Siva Velusamy2013-07-291-1/+1
|\| |
| * | Merge "Rename sdktestutils -> testutils"Siva Velusamy2013-07-291-1/+1
| |\|
| | * Rename sdktestutils -> testutilsSiva Velusamy2013-07-291-1/+1
| |/
* | am 88d02470: Merge "Change import path to sparse array"Siva Velusamy2013-07-294-5/+5
|\|
| * Merge "Change import path to sparse array"Siva Velusamy2013-07-294-5/+5
| |\
| | * Change import path to sparse arraySiva Velusamy2013-07-254-5/+5
* | | am a90745a2: Merge "Add clarifying comment."Siva Velusamy2013-07-251-0/+9
|\| |
| * | Merge "Add clarifying comment."Siva Velusamy2013-07-261-0/+9
| |\ \
| | * | Add clarifying comment.Siva Velusamy2013-07-251-0/+9
| |/ /
* | | am 5a0e0edd: Merge "Fix gldebugger formatter test"Siva Velusamy2013-07-251-3/+3
|\| |
| * | Merge "Fix gldebugger formatter test"Siva Velusamy2013-07-251-3/+3
| |\ \
| | * | Fix gldebugger formatter testSiva Velusamy2013-07-251-3/+3
* | | | am 5f3c99c7: Merge "Add support for additional ES3 state, primarily for textu...Siva Velusamy2013-07-256-20/+479
|\| | |
| * | | Merge "Add support for additional ES3 state, primarily for textures"Siva Velusamy2013-07-256-20/+479
| |\| |
| | * | Add support for additional ES3 state, primarily for texturesSiva Velusamy2013-07-256-20/+479
| |/ /
* | | am 5f550b74: Merge "Support dynamically linked llvm-rs-cc"Xavier Ducrohet2013-07-252-5/+14
|\| |
| * | Merge "Support dynamically linked llvm-rs-cc"Xavier Ducrohet2013-07-252-5/+14
| |\ \
| | * | Support dynamically linked llvm-rs-ccXavier Ducrohet2013-07-252-5/+14
* | | | am eb2e2256: Merge "Use systrace html prefix and suffix from platform tools"Siva Velusamy2013-07-253-46/+39
|\| | |
| * | | Merge "Use systrace html prefix and suffix from platform tools"Siva Velusamy2013-07-253-46/+39
| |\ \ \
| | * | | Use systrace html prefix and suffix from platform toolsSiva Velusamy2013-07-253-46/+39
| | | |/ | | |/|
* | | | am 46e78a4c: Merge "Fix renderscript issue on windows."Xavier Ducrohet2013-07-253-13/+9
|\| | |
| * | | Merge "Fix renderscript issue on windows."Xavier Ducrohet2013-07-253-13/+9
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fix renderscript issue on windows.Xavier Ducrohet2013-07-253-13/+9
| |/
* | am 50ab1922: am 3b49d504: Merge "Fix gradle export on windows."Xavier Ducrohet2013-07-241-1/+1
|\|
| * am 3b49d504: Merge "Fix gradle export on windows."Xavier Ducrohet2013-07-241-1/+1
| |\
| | * Merge "Fix gradle export on windows."jb-mr1.1-dev-plus-aospXavier Ducrohet2013-07-241-1/+1
| | |\
| | | * Fix gradle export on windows.Xavier Ducrohet2013-07-241-1/+1
| | |/
* | | am ef9cc936: am 77ba389d: Merge "Remove systrace from tools.atree"Siva Velusamy2013-07-221-8/+0
|\| |
| * | am 77ba389d: Merge "Remove systrace from tools.atree"Siva Velusamy2013-07-221-8/+0
| |\|
| | * Merge "Remove systrace from tools.atree"Siva Velusamy2013-07-221-8/+0
| | |\
| | | * Remove systrace from tools.atreeSiva Velusamy2013-07-191-8/+0
| | |/
* | | am 8a326dd7: am 9d8f40dd: Merge changes Ie793b684,I083290cdRaphael Moll2013-07-162-50/+141
|\| |
| * | am 9d8f40dd: Merge changes Ie793b684,I083290cdRaphael Moll2013-07-162-50/+141
| |\|
| | * Merge changes Ie793b684,I083290cdRaphael Moll2013-07-162-50/+141
| | |\
| | | * Change create_symlinks to use gradle-based libraries.Raphael Moll2013-07-161-50/+140
| | | * ADT: fix missing lib dependency in ADT base.Raphael Moll2013-07-161-0/+1
* | | | am b8f35113: am b251da9c: Merge "Force containers to be exported if maven is ...Xavier Ducrohet2013-07-121-12/+69
|\| | |
| * | | am b251da9c: Merge "Force containers to be exported if maven is not used."Xavier Ducrohet2013-07-121-12/+69
| |\| |
| | * | Merge "Force containers to be exported if maven is not used."Xavier Ducrohet2013-07-121-12/+69
| | |\ \
| | | * | Force containers to be exported if maven is not used.Xavier Ducrohet2013-07-121-12/+69
| | |/ /
* | | | am a5e16a22: am 49fa77c2: Merge "Fix error detection on ExportStatus."Xavier Ducrohet2013-07-121-1/+3
|\| | |
| * | | am 49fa77c2: Merge "Fix error detection on ExportStatus."Xavier Ducrohet2013-07-121-1/+3
| |\| |