aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Update SDK lint to the 2.0 release version" into emu-2.0-releaseemu-2.0-releaseVince Harron2016-03-30278-2894/+23236
|\
| * Update SDK lint to the 2.0 release versionTor Norbye2016-03-30278-2894/+23236
|/
* Merge "Adds a timeline data method to save speed samples." into studio-1.4-devemu-1.5-releaseYuxin Yu2015-08-192-3/+170
|\
| * Adds a timeline data method to save speed samples.Yusheen Yu2015-08-182-3/+170
* | Merge "Throwing InterruptedException instead of catching it in read." into st...Chester Hsieh2015-08-181-31/+37
|\ \
| * | Throwing InterruptedException instead of catching it in read.Chester Hsieh2015-08-171-31/+37
* | | Merge "Re-enable incremental markers for integration testing." into studio-1....Michal Bendowski2015-08-126-2/+52
|\ \ \
| * | | Re-enable incremental markers for integration testing.Michal Bendowski2015-08-056-2/+52
* | | | Merge "API change to expose device API getter." into studio-1.4-devChester Hsieh2015-08-112-6/+17
|\ \ \ \
| * | | | API change to expose device API getter.Chester Hsieh2015-07-292-6/+17
* | | | | Merge "Tweak addr2line fix." into studio-1.4-devChristopher Ferris2015-08-111-1/+1
|\ \ \ \ \
| * | | | | Tweak addr2line fix.Christopher Ferris2015-08-111-1/+1
* | | | | | Merge "181805: Lint false positive about "fullBackupContent"." into studio-1....Tor Norbye2015-08-112-17/+150
|\ \ \ \ \ \
| * | | | | | 181805: Lint false positive about "fullBackupContent".Tor Norbye2015-08-102-17/+150
|/ / / / / /
* | | | | | Merge "Ensure that all GMS libraries use the exact same versions (b/22709708)...Tor Norbye2015-08-113-12/+212
|\ \ \ \ \ \
| * | | | | | Ensure that all GMS libraries use the exact same versions (b/22709708)Tor Norbye2015-08-053-12/+212
* | | | | | | Merge "Remove variant name from AndroidReportTask." into studio-1.4-devChris Warrington2015-08-103-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Remove variant name from AndroidReportTask.Chris Warrington2015-07-313-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Fix NPE if the reference is null in findResValue" into studio-1.4-devDiego Perez2015-08-101-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix NPE if the reference is null in findResValueDiego Perez2015-08-031-1/+1
| |/ / / / /
* | | | | | Merge "Move thread pool configuration to AndroidGradleOptions." into studio-1...Michal Bendowski2015-08-072-9/+30
|\ \ \ \ \ \
| * | | | | | Move thread pool configuration to AndroidGradleOptions.Michal Bendowski2015-08-042-9/+30
* | | | | | | Merge "Lint: allow <vector> drawable with Gradle 1.4+" into studio-1.4-devMichal Bendowski2015-08-072-5/+52
|\ \ \ \ \ \ \
| * | | | | | | Lint: allow <vector> drawable with Gradle 1.4+Michal Bendowski2015-08-072-5/+52
|/ / / / / / /
* | | | | | | Merge "Fix tests for IDBytes being private now." into studio-1.4-devIan Cottrell2015-08-074-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix tests for IDBytes being private now.Ian Cottrell2015-08-074-3/+7
|/ / / / / / /
* | | | | | | Merge changes I3a1d9ecb,I4a0d33bc,I7e901ced,I2d5c6791,Ida40cc68, ... into stu...Ian Cottrell2015-08-0763-368/+4300
|\ \ \ \ \ \ \
| * | | | | | | Add the Box class and have all the box types implement it.Ian Cottrell2015-08-0727-2/+152
| * | | | | | | Make the AnyType extend and stub implement schema.TypeIan Cottrell2015-08-071-1/+13
| * | | | | | | Add the schema.Type, and make all the schema type objects extend and stub imp...Ian Cottrell2015-08-0710-8/+198
| * | | | | | | Kill Call and Result types and just use BinaryObjectIan Cottrell2015-08-073-53/+4
| * | | | | | | Update the binary package to the new encoding scheme, with objects, variants,...Ian Cottrell2015-08-0712-297/+164
| * | | | | | | Chain the factories togetherIan Cottrell2015-08-071-0/+2
| * | | | | | | Add constants for gfx editor plugin.Ian Cottrell2015-08-071-0/+4
| * | | | | | | Delete old generated code, and run new generator.Ian Cottrell2015-08-0747-73/+3829
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Tune up the threshold for image difference, enable more tests" into st...Tenghui Zhu2015-08-061-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Tune up the threshold for image difference, enable more testsztenghui2015-08-051-8/+8
| |/ / / / / /
* | | | | | | Merge "Split variantScope into interface + class." into studio-1.4-devXavier Ducrohet2015-08-0611-562/+981
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Split variantScope into interface + class.Xavier Ducrohet2015-08-0611-562/+981
|/ / / / / /
* | | | | | Merge "Fix golden image generation for VectorDrawable test" into studio-1.4-devTenghui Zhu2015-08-051-5/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix golden image generation for VectorDrawable testztenghui2015-08-041-5/+5
| |/ / / /
* | | | | Merge "Handle multi-flavor and per-variant java resources." into studio-1.4-devMichal Bendowski2015-08-052-74/+88
|\ \ \ \ \
| * | | | | Handle multi-flavor and per-variant java resources.Michal Bendowski2015-08-052-74/+88
|/ / / / /
* | | | | Merge "Don't regenerate the same mockable jar for different modules." into st...Michal Bendowski2015-08-052-3/+17
|\ \ \ \ \
| * | | | | Don't regenerate the same mockable jar for different modules.Michal Bendowski2015-08-052-3/+17
|/ / / / /
* | | | | Merge "Resurrect recycler view adapter feature constant." into studio-1.4-devDeepanshu Gupta2015-08-041-1/+1
|\ \ \ \ \
| * | | | | Resurrect recycler view adapter feature constant.Deepanshu Gupta2015-07-231-1/+1
* | | | | | Merge "Support unit test for new plugin" into studio-1.4-devRaymond Chiu2015-08-0413-189/+462
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Support unit test for new pluginRaymond Chiu2015-08-0413-189/+462
* | | | | | Merge "Improve error messages related to signing." into studio-1.4-devMichal Bendowski2015-08-043-21/+35
|\ \ \ \ \ \