aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge "Match language-specific flags before default locale country matches" i...Tor Norbye2014-08-291-11/+12
| |\
| | * Match language-specific flags before default locale country matchesTor Norbye2014-08-291-11/+12
| |/
* | Merge "emulator/opengl: Cleanup build files + remove obsolete tests."David 'Digit' Turner2014-08-2962-6756/+84
|\ \ | |/ |/|
| * emulator/opengl: Cleanup build files + remove obsolete tests.David 'Digit' Turner2014-08-2762-6756/+84
|/
* Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-181-1/+1
|\
| * Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-161-1/+1
| |\
| | * gltrace: Increase launch timeoutSiva Velusamy2014-08-181-1/+1
| |/
* | Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
|\ \ | |/
| * Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
| |\
| | * 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
|\ \ | |/
| * 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 "Support dynamic lib name without ".dylib" on Mac"David Turner2014-07-233-4/+44
|\ \
| * | Support dynamic lib name without ".dylib" on MacTina Zhang2014-07-273-4/+44
|/ /
* | Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+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 "Merge commit 'ae461d3' into mmerge"Siva Velusamy2014-07-234-239/+0
|\ \
| * \ Merge commit 'ae461d3' into mmergeSiva Velusamy2014-07-234-239/+0
| |\ \ |/ / / | | _
| * 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
|\ \ | |/
| * 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
|\ \ | |/
| * 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
|\ \ \ | |/ /
| * | 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-211-0/+4
|\ \ | |/
| * 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-211-5/+5
|\ \ \ | |/ /
| * | 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-213-3/+102
|\ \ \ | |/ /
| * | 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-211-1/+6
|\ \ \ | |/ /
| * | 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-2140-1077/+876
|\ \ \ | |/ /
| * | 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-219-21/+24
|\ \ | |/
| * Merge "emulator/opengl: Add global lock to libOpenglRender." into idea133David 'Digit' Turner2014-07-024-14/+17
| |\