aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Don't recursively make when calling create_all_symlinks.sh from a make...Ying Wang2013-08-233-20/+20
|\
| * Don't recursively make when calling create_all_symlinks.sh from a makefile.Ying Wang2013-08-223-20/+20
* | Merge "Fix issue with gradle export."Xavier Ducrohet2013-08-211-0/+6
|\ \ | |/ |/|
| * Fix issue with gradle export.Xavier Ducrohet2013-08-211-0/+6
|/
* Merge "Support for installing SDK in C:\Program Files"Scott Barta2013-08-204-18/+18
|\
| * Support for installing SDK in C:\Program FilesScott Barta2013-08-154-18/+18
* | Merge changes Ibc381479,I21a2430cXavier Ducrohet2013-08-143-30/+15
|\ \
| * | ColorBuffer: Remove the y-invert Intel GPU bug workaroundMartin Storsjo2013-08-102-29/+5
| * | EglMacApi: Use the right pbuffer texture target and format parametersMartin Storsjo2013-08-101-1/+10
| |/
* | Merge "Renderscript support mode for ant."Xavier Ducrohet2013-08-141-10/+18
|\ \
| * | Renderscript support mode for ant.Xavier Ducrohet2013-08-131-10/+18
| |/
* | Merge "Check the return value of eglChooseConfig"Xavier Ducrohet2013-08-131-1/+3
|\ \
| * | Check the return value of eglChooseConfigMartin Storsjo2013-08-111-1/+3
| |/
* | Merge "adt launch: Fix spelling mistake"Siva Velusamy2013-08-121-1/+1
|\ \
| * | adt launch: Fix spelling mistakeSiva Velusamy2013-08-121-1/+1
| |/
* | Merge "Some changes added to compile and run with Java 6 and Java 7."Xavier Ducrohet2013-08-123-6/+6
|\ \ | |/ |/|
| * Some changes added to compile and run with Java 6 and Java 7.Jerome Pilliet2012-12-173-6/+6
* | Merge "Update template location for SDK build"Josiah Gaskin2013-08-01273-6436/+4
|\ \
| * | Update template location for SDK buildJosiah Gaskin2013-07-31273-6436/+4
|/ /
* | Merge "Change references from sdktestutils -> testutils"Siva Velusamy2013-07-293-3/+3
|\ \
| * | Change references from sdktestutils -> testutilsSiva Velusamy2013-07-293-3/+3
* | | Merge "Rename sdktestutils -> testutils"Siva Velusamy2013-07-291-1/+1
|\ \ \ | |/ /
| * | Rename sdktestutils -> testutilsSiva Velusamy2013-07-291-1/+1
|/ /
* | Merge "Change import path to sparse array"Siva Velusamy2013-07-294-5/+5
|\ \
| * | Change import path to sparse arraySiva Velusamy2013-07-254-5/+5
* | | Merge "Add clarifying comment."Siva Velusamy2013-07-261-0/+9
|\ \ \
| * | | Add clarifying comment.Siva Velusamy2013-07-251-0/+9
|/ / /
* | | Merge "Fix gldebugger formatter test"Siva Velusamy2013-07-251-3/+3
|\ \ \
| * | | Fix gldebugger formatter testSiva Velusamy2013-07-251-3/+3
* | | | 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
|/ / /
* | | Merge "Support dynamically linked llvm-rs-cc"Xavier Ducrohet2013-07-252-5/+14
|\ \ \
| * | | Support dynamically linked llvm-rs-ccXavier Ducrohet2013-07-252-5/+14
* | | | 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
| | |/ / | |/| |
* | | | Merge "Fix renderscript issue on windows."Xavier Ducrohet2013-07-253-13/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix renderscript issue on windows.Xavier Ducrohet2013-07-253-13/+9
|/ /
* | am 3b49d504: Merge "Fix gradle export on windows."Xavier Ducrohet2013-07-241-1/+1
|\ \
| * \ Merge "Fix gradle export on windows."Xavier Ducrohet2013-07-241-1/+1
| |\ \
| | * | Fix gradle export on windows.Xavier Ducrohet2013-07-241-1/+1
| |/ /
* | | 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 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 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
| |/ / /