aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix build."Xavier Ducrohet2012-08-134-5/+4
|\
| * Fix build.Xavier Ducrohet2012-08-134-5/+4
|/
* Merge "More refactoring."Xavier Ducrohet2012-08-13253-664/+398
|\
| * More refactoring.Xavier Ducrohet2012-08-13253-664/+398
|/
* Merge "Fixed "Bus error" running tests triangleV2 and triangleCM"Andrew Hsieh2012-08-122-6/+14
|\
| * Fixed "Bus error" running tests triangleV2 and triangleCMAndrew Hsieh2012-08-102-6/+14
* | Merge "Load devices defined in tools"Michael Wright2012-08-101-0/+9
|\ \
| * | Load devices defined in toolsMichael Wright2012-08-101-0/+9
* | | Merge "Update devices.xml shipped with tools"Michael Wright2012-08-101-426/+381
|\ \ \ | |/ /
| * | Update devices.xml shipped with toolsMichael Wright2012-08-101-426/+381
* | | Merge "Fix build."Roman Nurik2012-08-101-1/+1
|\ \ \
| * | | Fix build.Roman Nurik2012-08-101-1/+1
|/ / /
* | | Merge "Disable padding for action bar icons created from clipart."Roman Nurik2012-08-102-2/+8
|\ \ \ | |/ / |/| |
| * | Disable padding for action bar icons created from clipart.Roman Nurik2012-08-082-2/+8
* | | Merge "Force device list updates in the GLE to happen on the UI thread"Michael Wright2012-08-101-8/+17
|\ \ \
| * | | Force device list updates in the GLE to happen on the UI threadMichael Wright2012-08-091-8/+17
* | | | Merge "Set default scaled screen size to device's screen size"Michael Wright2012-08-103-6/+34
|\ \ \ \ | |/ / /
| * | | Set default scaled screen size to device's screen sizeMichael Wright2012-08-093-6/+34
* | | | Merge "Make AVDs repairable when the base device changes or is deleted"Michael Wright2012-08-1014-67/+250
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Make AVDs repairable when the base device changes or is deletedMichael Wright2012-08-0914-67/+250
|/ /
* | Merge "hv: Add more logging for when things go wrong."Siva Velusamy2012-08-092-0/+4
|\ \
| * | hv: Add more logging for when things go wrong.Siva Velusamy2012-08-092-0/+4
* | | Merge "Recommend java.lang.Math instead of android.util.FloatMath"Tor Norbye2012-08-094-65/+56
|\ \ \
| * | | Recommend java.lang.Math instead of android.util.FloatMathTor Norbye2012-08-094-65/+56
|/ / /
* | | Merge "36175: Lint crashes with java.nio.BufferUnderflowException"Tor Norbye2012-08-092-10/+137
|\ \ \
| * | | 36175: Lint crashes with java.nio.BufferUnderflowExceptionTor Norbye2012-08-092-10/+137
|/ / /
* | | Merge "Fix fragment handling in templates"Tor Norbye2012-08-094-4/+15
|\ \ \
| * | | Fix fragment handling in templatesTor Norbye2012-08-084-4/+15
* | | | Merge "Move kxml and layoutlib_api from plugin-adt up to plugin-base"Tor Norbye2012-08-086-9/+19
|\ \ \ \
| * | | | Move kxml and layoutlib_api from plugin-adt up to plugin-baseTor Norbye2012-08-086-9/+19
|/ / / /
* | | | Merge "Update lint test project for common refactoring"Tor Norbye2012-08-083-6/+7
|\ \ \ \
| * | | | Update lint test project for common refactoringTor Norbye2012-08-083-6/+7
* | | | | Merge "Improvements to relative layout move and delete operations"Tor Norbye2012-08-0814-89/+883
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Improvements to relative layout move and delete operationsTor Norbye2012-08-0814-89/+883
|/ / /
* | | Merge "Refactor common.jar"Xavier Ducrohet2012-08-08211-278/+522
|\ \ \
| * | | Refactor common.jarXavier Ducrohet2012-08-07211-278/+522
* | | | Merge "Make using GPU Emulation and Snapshots an error"Michael Wright2012-08-081-0/+7
|\ \ \ \
| * | | | Make using GPU Emulation and Snapshots an errorMichael Wright2012-08-071-0/+7
* | | | | Merge "Make missing devices.xml a warning rather than an error"Michael Wright2012-08-081-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Make missing devices.xml a warning rather than an errorMichael Wright2012-08-071-0/+2
* | | | | Merge "Add RAM, VM heap and internal storage size settings to AVDs"Michael Wright2012-08-082-13/+191
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Add RAM, VM heap and internal storage size settings to AVDsMichael Wright2012-08-072-13/+191
* | | | Merge "Cleanup dos2unix in plugins *.java (ADT, GLd, NDK)"Raphael Moll2012-08-0817-1761/+1761
|\ \ \ \
| * | | | Cleanup dos2unix in plugins *.java (ADT, GLd, NDK)Raphael Moll2012-08-0717-1761/+1761
* | | | | Merge "Cleanup: dos2unix some files in SdkController."Raphael Moll2012-08-0818-3357/+3357
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Cleanup: dos2unix some files in SdkController.Raphael Moll2012-08-0718-3357/+3357
| | |/ | |/|
* | | Merge "Look for extra templates under <vendor>/<package>"Tor Norbye2012-08-072-9/+48
|\ \ \
| * | | Look for extra templates under <vendor>/<package>Tor Norbye2012-08-072-9/+48
| |/ /
* | | Merge "uiautomator: Misc cleanups"Siva Velusamy2012-08-079-547/+511
|\ \ \
| * | | uiautomator: Misc cleanupsSiva Velusamy2012-08-079-547/+511
| |/ /