aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
| |\
| | * 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-212-13/+21
|\ \ | |/
| * 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
|\ \ \ | |/ /
| * | 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
|\ \ \ \ | |/ / /
| * | | 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
|\ \ \ \ | |/ / /
| * | | 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-07-011-1/+0
|\ \ \ | |/ /
| * | 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-07-019-235/+52
|\ \ \ | |/ /
| * | 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-306-9/+128
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | 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-2752-82/+82
|\ \ \ | |/ /
| * | 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-271-0/+53
|\ \ \ | |/ /
| * | 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-272-0/+210
|\ \ \ | |/ /
| * | Merge "Build and release annotations.jar" into idea133Siva Velusamy2014-06-262-0/+210
| |\ \
| | * | Build and release annotations.jarSiva Velusamy2014-06-272-0/+210
| | |/
* | | Merge "monitor: Update path to hprof-conv" into idea133Siva Velusamy2014-06-271-1/+1
|\ \ \ | |/ /
| * | Merge "monitor: Update path to hprof-conv" into idea133Siva Velusamy2014-06-261-1/+1
| |\ \ | | |/ | |/|
| | * monitor: Update path to hprof-convSiva Velusamy2014-06-271-1/+1
| |/
* | Merge "Fix zipalign/hprof-conv issue in ADT." into idea133Xavier Ducrohet2014-06-216-27/+31
|\ \ | |/
| * Merge "Fix zipalign/hprof-conv issue in ADT." into idea133Xavier Ducrohet2014-06-206-27/+31
| |\
| | * Fix zipalign/hprof-conv issue in ADT.Xavier Ducrohet2014-06-216-27/+31
* | | Merge "Remove ADT branding from p2 repo" into idea133Siva Velusamy2014-06-211-3/+0
|\ \ \ | |/ /
| * | Merge "Remove ADT branding from p2 repo" into idea133Siva Velusamy2014-06-201-3/+0
| |\ \ | | |/ | |/|
| | * Remove ADT branding from p2 repoSiva Velusamy2014-06-211-3/+0
| |/
* | Merge "Enable large sd cards." into idea133Xavier Ducrohet2014-06-191-0/+4
|\ \ | |/
| * Merge "Enable large sd cards." into idea133Xavier Ducrohet2014-06-171-0/+4
| |\
| | * Enable large sd cards.Xavier Ducrohet2014-06-191-0/+4
| |/