aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change Device List to Device Collection.Deepanshu Gupta2014-08-158-21/+27
* Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
|\
| * gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBSSiva Velusamy2014-08-141-2/+2
|/
* Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+2
|\
| * monitor: Move from sdk/ to sdk/eclipseSiva Velusamy2014-07-234-4/+2
|/
* Merge "monitor: Remove old build scripts and instructions" into idea133Siva Velusamy2014-07-234-230/+0
|\
| * monitor: Remove old build scripts and instructionsSiva Velusamy2014-07-234-230/+0
|/
* Merge "Include JDT as a required dependency" into idea133Siva Velusamy2014-07-221-0/+1
|\
| * Include JDT as a required dependencySiva Velusamy2014-07-221-0/+1
|/
* Merge "Add NDK plugin to ADT package feature" into idea133Siva Velusamy2014-07-221-0/+1
|\
| * Add NDK plugin to ADT package featureSiva Velusamy2014-07-211-0/+1
* | Merge "Update Eclipse plugins' version from 23.0.2 -> 23.0.3" into idea133Siva Velusamy2014-07-2252-76/+76
|\|
| * Update Eclipse plugins' version from 23.0.2 -> 23.0.3Siva Velusamy2014-07-2152-76/+76
|/
* Merge "Don't compress apks." into idea133Xavier Ducrohet2014-07-201-0/+4
|\
| * Don't compress apks.Xavier Ducrohet2014-07-211-0/+4
* | Merge "Correct incorrect test for RenderScript support." into idea133Xavier Ducrohet2014-07-171-5/+5
|\ \ | |/ |/|
| * Correct incorrect test for RenderScript support.Jean-Luc Brouillet2014-07-181-5/+5
* | Merge "Add support for tools:menu" into idea133Deepanshu Gupta2014-07-173-3/+102
|\ \
| * | Add support for tools:menuDeepanshu Gupta2014-07-173-3/+102
|/ /
* | Merge "73313: NullPointerException Lint error on adt 23.0.2" into idea133Tor Norbye2014-07-151-1/+6
|\ \
| * | 73313: NullPointerException Lint error on adt 23.0.2Tor Norbye2014-07-141-1/+6
|/ /
* | Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133David 'Digit' Turner2014-07-1040-1077/+876
|\ \ | |/ |/|
| * emulator/opengl: Remove out-of-process handling code.David 'Digit' Turner2014-07-0912-628/+17
| * emulator/opengl: refactor Thread class.David 'Digit' Turner2014-07-0915-279/+467
| * emulator/opengl: refactor shared library handling.David 'Digit' Turner2014-07-0917-174/+396
|/
* Merge "emulator/opengl: Add global lock to libOpenglRender." into idea133David 'Digit' Turner2014-07-024-14/+17
|\
| * emulator/opengl: Add global lock to libOpenglRender.David 'Digit' Turner2014-07-084-14/+17
|/
* Merge "Move SdkVersionInfo from sdk-common to sdklib, part 3." into idea133Raphael Moll2014-07-065-7/+7
|\
| * Move SdkVersionInfo from sdk-common to sdklib, part 3.Raphael Moll2014-07-075-7/+7
|/
* Merge "ADT: Fix NPE in InstrumentationRunnerValidator" into idea133Siva Velusamy2014-07-022-13/+21
|\
| * ADT: Fix NPE in InstrumentationRunnerValidatorSiva Velusamy2014-07-012-13/+21
* | Merge "Update version to 23.0.2" into idea133Xavier Ducrohet2014-07-011-1/+1
|\ \
| * | Update version to 23.0.2Xavier Ducrohet2014-07-011-1/+1
* | | Merge "Update Eclipse plugins' version from 23.0.1 -> 23.0.2" into idea133Xavier Ducrohet2014-07-0152-76/+76
|\ \ \
| * | | Update Eclipse plugins' version from 23.0.1 -> 23.0.2Siva Velusamy2014-07-0152-76/+76
|/ / /
* | | Merge "Release proguard.bat in windows sdk" into idea133Xavier Ducrohet2014-07-011-13/+24
|\ \ \ | | |/ | |/|
| * | Release proguard.bat in windows sdkSiva Velusamy2014-07-011-13/+24
|/ /
* | Merge "Remove about.mappings from build.properties" into idea133Siva Velusamy2014-06-301-1/+0
|\ \
| * | Remove about.mappings from build.propertiesSiva Velusamy2014-07-011-1/+0
|/ /
* | Merge "Set default product" into idea133Siva Velusamy2014-06-289-235/+52
|\ \
| * | Set default productSiva Velusamy2014-06-309-235/+52
| |/
* | Merge "Fix Template Inflation in ADT" into idea133Josiah Gaskin2014-06-276-9/+128
|\ \ | |/ |/|
| * Fix Template Inflation in ADTJosiah Gaskin2014-06-276-9/+128
* | Merge "Update version to 23.0.1" into idea133Xavier Ducrohet2014-06-271-1/+1
|\ \
| * | Update version to 23.0.1Xavier Ducrohet2014-06-271-1/+1
|/ /
* | Merge "Update plugin versions to 23.0.1" into idea133Siva Velusamy2014-06-2652-82/+82
|\ \
| * | Update plugin versions to 23.0.1Siva Velusamy2014-06-2752-82/+82
|/ /
* | Merge "Fix proguard packaging in the tools." into idea133Xavier Ducrohet2014-06-261-0/+53
|\ \
| * | Fix proguard packaging in the tools.Xavier Ducrohet2014-06-271-0/+53
| |/
* | Merge "Build and release annotations.jar" into idea133Siva Velusamy2014-06-262-0/+210
|\ \