aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | am f9344c0e: (-s ours) am 5a6f9b19: (-s ours) Reconcile with jb-mr0-release -...The Android Open Source Project2012-08-070-0/+0
|\ \ \ | |/ /
| * | am 5a6f9b19: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| |\ \ |/ / /
| * | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| |\ \ |/ / /
| * | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-070-0/+0
| |\ \
* | \ \ Merge "Catch exceptions during class initialization."Tor Norbye2012-08-071-22/+26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Catch exceptions during class initialization.Tor Norbye2012-08-071-22/+26
* | | | Merge "Convert EOL from dos2unix in sdkuilib *.java"Raphael Moll2012-08-0727-7620/+7620
|\ \ \ \
| * | | | Convert EOL from dos2unix in sdkuilib *.javaRaphael Moll2012-08-0727-7620/+7620
* | | | | Merge "Convert EOL from Windows to Unix in sdklib *.java"Raphael Moll2012-08-0772-18556/+18612
|\ \ \ \ \ | |/ / / /
| * | | | Convert EOL from Windows to Unix in sdklib *.javaRaphael Moll2012-08-0772-18556/+18612
* | | | | Merge "Include status-bar node when writing out Device's software"Michael Wright2012-08-071-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Include status-bar node when writing out Device's softwareMichael Wright2012-08-071-0/+2
* | | | | Merge "Invoke formatter on newly created or merged template files"Tor Norbye2012-08-072-13/+62
|\ \ \ \ \
| * | | | | Invoke formatter on newly created or merged template filesTor Norbye2012-08-062-13/+62
| | |/ / / | |/| | |
* | | | | Merge "Asset studio fixes"Tor Norbye2012-08-077-15/+54
|\ \ \ \ \
| * | | | | Asset studio fixesTor Norbye2012-08-067-15/+54
| |/ / / /
* | | | | Merge "Update lint unit test golden files to contain more details"Tor Norbye2012-08-0762-761/+1893
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update lint unit test golden files to contain more detailsTor Norbye2012-08-0662-761/+1893
* | | | | Merge "uiautomator: fix launch script"Siva Velusamy2012-08-063-18/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | uiautomator: fix launch scriptSiva Velusamy2012-08-063-18/+22
* | | | | Merge "Java implementation of bspatch."Raphael Moll2012-08-061-0/+533
|\ \ \ \ \
| * | | | | Java implementation of bspatch.Raphael Moll2012-08-041-0/+533
* | | | | | Merge "SDK Manager: allow user URLs to point to sys-img.xml too."Raphael Moll2012-08-061-1/+15
|\ \ \ \ \ \
| * | | | | | SDK Manager: allow user URLs to point to sys-img.xml too.Raphael Moll2012-08-021-1/+15
| |/ / / / /
* | | | | | Merge "Fix Asset Studio tests by adding back Bugdroid clipart."Roman Nurik2012-08-062-0/+0
|\ \ \ \ \ \
| * | | | | | Fix Asset Studio tests by adding back Bugdroid clipart.Roman Nurik2012-08-062-0/+0
* | | | | | | Merge "Increment count when backing up bad devices.xml"Michael Wright2012-08-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Increment count when backing up bad devices.xmlMichael Wright2012-08-061-1/+1
* | | | | | | | Merge "Added status bar qualifier to device schema"Michael Wright2012-08-0612-3/+49
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Added status bar qualifier to device schemaMichael Wright2012-08-0612-3/+49
|/ / / / / / /
* | | | | | | Merge "Replace asset studio clipart with action bar icon pack."Roman Nurik2012-08-06328-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Replace asset studio clipart with action bar icon pack.Roman Nurik2012-08-06328-0/+0
* | | | | | | Merge "ndk: Remove redundant implementation of IShellOutputReceiver"Siva Velusamy2012-08-061-33/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | ndk: Remove redundant implementation of IShellOutputReceiverSiva Velusamy2012-08-061-33/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge "35875: Lint too strict about translating strings by default."Tor Norbye2012-08-0610-10/+172
|\ \ \ \ \ \
| * | | | | | 35875: Lint too strict about translating strings by default.Tor Norbye2012-08-0610-10/+172
|/ / / / / /
* | | | | | Merge "Allow lint cli --sources to specify a path, and use from ant lint"Tor Norbye2012-08-068-89/+119
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow lint cli --sources to specify a path, and use from ant lintTor Norbye2012-08-068-89/+119
* | | | | | Merge "Add support for additional languages in the typo detector"Tor Norbye2012-08-0620-152/+7117
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add support for additional languages in the typo detectorTor Norbye2012-08-0320-152/+7117
* | | | | | Merge "Login activity template."Roman Nurik2012-08-0611-0/+490
|\ \ \ \ \ \
| * | | | | | Login activity template.Roman Nurik2012-08-0611-0/+490
* | | | | | | Merge "Improve Maven defaults in lint"Tor Norbye2012-08-061-12/+38
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Improve Maven defaults in lintTor Norbye2012-08-061-12/+38
| | |/ / / / | |/| | | |
* | | | | | Merge "35804: When importantForAccessibility="no" is set, don't warn"Tor Norbye2012-08-063-2/+13
|\ \ \ \ \ \
| * | | | | | 35804: When importantForAccessibility="no" is set, don't warnTor Norbye2012-08-033-2/+13
* | | | | | | Merge "Minor app template fixes."Roman Nurik2012-08-063-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Minor app template fixes.Roman Nurik2012-08-033-4/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Fullscreen activity template."Roman Nurik2012-08-0614-0/+767
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fullscreen activity template.Roman Nurik2012-08-0614-0/+767
| |/ / / / /