aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-dev aut...Tor Norbye2015-04-071-0/+13
|\
| * Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-devTor Norbye2015-04-071-0/+13
| |\
| | * Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-devTor Norbye2015-04-071-0/+13
| | |\
| | | * Track tools/base API change in Eclipse pluginTor Norbye2015-04-061-0/+13
| | |/
* | | Merge "Update easymock version to 3.3" into studio-1.3-dev automerge: 1765a16Siva Velusamy2015-04-071-1/+1
|\ \ \ | |/ /
| * | Merge "Update easymock version to 3.3" into studio-1.3-devSiva Velusamy2015-04-071-1/+1
| |\ \ | | |/
| | * Merge "Update easymock version to 3.3" into studio-1.3-devSiva Velusamy2015-04-071-1/+1
| | |\
| | | * Update easymock version to 3.3Siva Velusamy2015-04-061-1/+1
| | |/
* | | Merge "Move to the new LayoutlibCallback." into studio-1.3-dev automerge: 80e...Deepanshu Gupta2015-04-021-4/+10
|\ \ \ | |/ /
| * | Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
| |\ \ | | |/
| | * Merge "Move to the new LayoutlibCallback." into studio-1.3-devDeepanshu Gupta2015-04-021-4/+10
| | |\
| | | * Move to the new LayoutlibCallback.Deepanshu Gupta2015-04-021-4/+10
| | |/
* | | am 52163238: Merge "Update Windows SDK build to track change from OpenSSL to ...Kenny Root2015-03-071-0/+1
|\ \ \
| * \ \ Merge "Update Windows SDK build to track change from OpenSSL to BoringSSL"Kenny Root2015-03-061-0/+1
| |\ \ \
| | * | | Update Windows SDK build to track change from OpenSSL to BoringSSLBrian Carlstrom2015-03-061-0/+1
| |/ / /
* | | | am ba367d5e: Merge "Revert "Add targetPlatform for executable binaries"" into...Xavier Ducrohet2015-02-134-55/+60
|\ \ \ \ | |/ / /
| * | | Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-d...Xavier Ducrohet2015-02-134-55/+60
| |\ \ \ | | |/ /
| | * | Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-devXavier Ducrohet2015-02-134-55/+60
| | |\ \ | | | |/
| | | * Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-devXavier Ducrohet2015-02-124-55/+60
| | | |\
| | | | * Revert "Add targetPlatform for executable binaries"Xavier Ducrohet2015-02-124-55/+60
| | | |/
* | | | am 1d8f0243: Merge "Add targetPlatform for executable binaries" into studio-1...Raymond Chiu2015-02-104-60/+55
|\ \ \ \ | |/ / /
| * | | Merge "Add targetPlatform for executable binaries" into studio-1.2-dev autome...Raymond Chiu2015-02-104-60/+55
| |\ \ \ | | |/ /
| | * | Merge "Add targetPlatform for executable binaries" into studio-1.2-devRaymond Chiu2015-02-104-60/+55
| | |\ \ | | | |/
| | | * Merge "Add targetPlatform for executable binaries" into studio-1.2-devRaymond Chiu2015-02-104-60/+55
| | | |\
| | | | * Add targetPlatform for executable binariesRaymond Chiu2015-02-104-60/+55
| | | |/
* | | | am 8ab5c13b: Merge "pixel perfect: Disable controls" into studio-1.1-dev auto...Tor Norbye2015-02-051-3/+5
|\ \ \ \ | |/ / /
| * | | Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b23493...Tor Norbye2015-02-051-3/+5
| |\ \ \ | | |/ /
| | * | Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933Tor Norbye2015-02-051-3/+5
| | |\ \ | | | |/
| | | * Merge "pixel perfect: Disable controls" into studio-1.1-devTor Norbye2015-02-051-3/+5
| | | |\
| | | | * Merge "pixel perfect: Disable controls" into studio-1.1-devTor Norbye2015-02-031-3/+5
| | | | |\
| | | | | * pixel perfect: Disable controlsSiva Velusamy2015-02-031-3/+5
| | | | |/
* | | | | am ad4387f2: Merge "Update Eclipse plugin to handle new LocaleQualifier API" ...Tor Norbye2015-02-0516-452/+439
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into studio-1...Tor Norbye2015-02-0516-452/+439
| |\ \ \ \ | | |/ / /
| | * | | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into studio-1...Tor Norbye2015-02-0516-452/+439
| | |\ \ \ | | | |/ /
| | | * | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into studio-1...Tor Norbye2015-02-0416-452/+439
| | | |\ \
| | | | * | Update Eclipse plugin to handle new LocaleQualifier APITor Norbye2015-02-0416-452/+439
| | | |/ /
* | | | | am 889c6f76: Merge "Remove stale scripts" into studio-1.2-dev automerge: 2e56...Siva Velusamy2015-02-0312-1493/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Remove stale scripts" into studio-1.2-dev automerge: 2e5634dSiva Velusamy2015-02-0312-1493/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge "Remove stale scripts" into studio-1.2-devSiva Velusamy2015-02-0312-1493/+0
| | |\ \ \ | | | |/ /
| | | * | Merge "Remove stale scripts" into studio-1.2-devSiva Velusamy2015-02-0312-1493/+0
| | | |\ \
| | | | * | Remove stale scriptsSiva Velusamy2015-02-0312-1493/+0
* | | | | | am 379f8aee: Merge "Add AssetRepository to render params." into studio-1.1-de...Tor Norbye2015-02-020-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add AssetRepository to render params." into studio-1.1-dev automerge: ...Tor Norbye2015-02-020-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Add AssetRepository to render params." into studio-1.1-dev automerge: ...Tor Norbye2015-01-290-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Add AssetRepository to render params." into studio-1.1-devTor Norbye2015-01-290-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge "Add AssetRepository to render params." into studio-1.1-devTor Norbye2015-01-291-0/+4
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Add AssetRepository to render params.Deepanshu Gupta2015-01-281-0/+4
| | | | |/
* | | | | am a3c15cb0: Merge "Add AssetRepository to render params." into studio-1.2-de...Deepanshu Gupta2015-01-281-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add AssetRepository to render params." into studio-1.2-dev automerge: ...Deepanshu Gupta2015-01-281-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add AssetRepository to render params." into studio-1.2-devDeepanshu Gupta2015-01-281-0/+4
| | |\ \ \ | | | |/ /