aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 9c676ef4: Merge "Match language-specific flags before default locale count...Tor Norbye2014-09-021-11/+12
|\
| * Merge "Match language-specific flags before default locale country matches" i...Tor Norbye2014-09-021-11/+12
| |\
| | * 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
| | |/
* | | am 972e1c6d: Merge "emulator/opengl: Cleanup build files + remove obsolete te...David 'Digit' Turner2014-08-2962-6756/+84
|\ \ \ | |/ /
| * | 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
| |/
* | am 956b01fd: Merge "gltrace: Increase launch timeout" into idea133 automerge:...Siva Velusamy2014-08-181-1/+1
|\ \ | |/
| * 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
| | |/
* | | am 39f4d677: Merge "Change Device List to Device Collection." into idea133 au...Deepanshu Gupta2014-08-158-21/+27
|\ \ \ | |/ /
| * | 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
| | |/
* | | am 5131332b: Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRI...Siva Velusamy2014-08-141-2/+2
|\ \ \ | |/ /
| * | 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
| | |/
* | | am 1af9ef83: Merge "Support dynamic lib name without ".dylib" on Mac"David Turner2014-07-283-4/+44
|\ \ \ | |/ /
| * | 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
| |/ /
* | | am ec58e2e9: Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133 auto...Siva Velusamy2014-07-234-4/+2
|\ \ \ | |/ /
| * | 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
| | |/
* | | am 0d29dd07: Merge "Merge commit \'ae461d3\' into mmerge"Siva Velusamy2014-07-234-239/+0
|\ \ \ | |/ /
| * | 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
| | |/
* | | am 37075b01: Merge "Include JDT as a required dependency" into idea133 autome...Siva Velusamy2014-07-221-0/+1
|\ \ \ | |/ /
| * | 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
| | |/
* | | am 97c86dcf: Merge "Add NDK plugin to ADT package feature" into idea133 autom...Siva 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
* | | | am 4f8c939e: Merge "Update Eclipse plugins\' version from 23.0.2 -> 23.0.3" i...Siva Velusamy2014-07-2252-76/+76
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | am f005a74c: Merge "Don\'t compress apks." into idea133 automerge: b6d2791Xavier Ducrohet2014-07-211-0/+4
|\ \ \ | |/ /
| * | 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
* | | | am ab18c6fb: Merge "Correct incorrect test for RenderScript support." into id...Xavier Ducrohet2014-07-211-5/+5
|\ \ \ \ | |/ / /
| * | | 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
| | |\ \ | | | |/ | | |/|