aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 44021bc2: am 39f4d677: Merge "Change Device List to Device Collection." in...Deepanshu Gupta2015-03-208-21/+27
|\
| * 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 9b41c2c1: am 5131332b: Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX...Siva Velusamy2015-03-201-2/+2
|\ \ \ \ | |/ / /
| * | | 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 7915a19f: am 1af9ef83: Merge "Support dynamic lib name without ".dylib" on...David Turner2015-03-203-4/+44
|\ \ \ \ | |/ / /
| * | | 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 eea061e4: am ec58e2e9: Merge "monitor: Move from sdk/ to sdk/eclipse" into...Siva Velusamy2015-03-204-4/+2
|\ \ \ \ | |/ / /
| * | | 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 9fb6db25: am 0d29dd07: Merge "Merge commit \'ae461d3\' into mmerge"Siva Velusamy2015-03-204-239/+0
|\ \ \ \ | |/ / /
| * | | 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 3ee0d147: am 37075b01: Merge "Include JDT as a required dependency" into i...Siva Velusamy2015-03-201-0/+1
|\ \ \ \ | |/ / /
| * | | 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 2bc837a5: am 97c86dcf: Merge "Add NDK plugin to ADT package feature" into ...Siva Velusamy2015-03-201-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 7c6d69c7: am 4f8c939e: Merge "Update Eclipse plugins\' version from 23.0.2...Siva Velusamy2015-03-2052-76/+76
|\ \ \ \ \ | |/ / / /
| * | | | 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 3f04bf35: am f005a74c: Merge "Don\'t compress apks." into idea133 automerg...Xavier Ducrohet2015-03-201-0/+4
|\ \ \ \ | |/ / /
| * | | 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 9c57d0c3: am ab18c6fb: Merge "Correct incorrect test for RenderScript supp...Xavier Ducrohet2015-03-201-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | |\ \ | | | | |/ | | | |/|
| | | | * Correct incorrect test for RenderScript support.Jean-Luc Brouillet2014-07-181-5/+5