Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | am f9344c0e: (-s ours) am 5a6f9b19: (-s ours) Reconcile with jb-mr0-release -... | The Android Open Source Project | 2012-08-07 | 0 | -0/+0 | |
|\ \ \ | |/ / | ||||||
| * | | am 5a6f9b19: (-s ours) Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-07 | 0 | -0/+0 | |
| |\ \ |/ / / | ||||||
| * | | Reconcile with jb-mr0-release - do not merge | The Android Open Source Project | 2012-08-07 | 0 | -0/+0 | |
| |\ \ |/ / / | ||||||
| * | | merge in jb-mr0-release history after reset to jb-dev | The Android Automerger | 2012-08-07 | 0 | -0/+0 | |
| |\ \ | ||||||
* | \ \ | Merge "Catch exceptions during class initialization." | Tor Norbye | 2012-08-07 | 1 | -22/+26 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | Catch exceptions during class initialization. | Tor Norbye | 2012-08-07 | 1 | -22/+26 | |
* | | | | Merge "Convert EOL from dos2unix in sdkuilib *.java" | Raphael Moll | 2012-08-07 | 27 | -7620/+7620 | |
|\ \ \ \ | ||||||
| * | | | | Convert EOL from dos2unix in sdkuilib *.java | Raphael Moll | 2012-08-07 | 27 | -7620/+7620 | |
* | | | | | Merge "Convert EOL from Windows to Unix in sdklib *.java" | Raphael Moll | 2012-08-07 | 72 | -18556/+18612 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Convert EOL from Windows to Unix in sdklib *.java | Raphael Moll | 2012-08-07 | 72 | -18556/+18612 | |
* | | | | | Merge "Include status-bar node when writing out Device's software" | Michael Wright | 2012-08-07 | 1 | -0/+2 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Include status-bar node when writing out Device's software | Michael Wright | 2012-08-07 | 1 | -0/+2 | |
* | | | | | Merge "Invoke formatter on newly created or merged template files" | Tor Norbye | 2012-08-07 | 2 | -13/+62 | |
|\ \ \ \ \ | ||||||
| * | | | | | Invoke formatter on newly created or merged template files | Tor Norbye | 2012-08-06 | 2 | -13/+62 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge "Asset studio fixes" | Tor Norbye | 2012-08-07 | 7 | -15/+54 | |
|\ \ \ \ \ | ||||||
| * | | | | | Asset studio fixes | Tor Norbye | 2012-08-06 | 7 | -15/+54 | |
| |/ / / / | ||||||
* | | | | | Merge "Update lint unit test golden files to contain more details" | Tor Norbye | 2012-08-07 | 62 | -761/+1893 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Update lint unit test golden files to contain more details | Tor Norbye | 2012-08-06 | 62 | -761/+1893 | |
* | | | | | Merge "uiautomator: fix launch script" | Siva Velusamy | 2012-08-06 | 3 | -18/+22 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | uiautomator: fix launch script | Siva Velusamy | 2012-08-06 | 3 | -18/+22 | |
* | | | | | Merge "Java implementation of bspatch." | Raphael Moll | 2012-08-06 | 1 | -0/+533 | |
|\ \ \ \ \ | ||||||
| * | | | | | Java implementation of bspatch. | Raphael Moll | 2012-08-04 | 1 | -0/+533 | |
* | | | | | | Merge "SDK Manager: allow user URLs to point to sys-img.xml too." | Raphael Moll | 2012-08-06 | 1 | -1/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | SDK Manager: allow user URLs to point to sys-img.xml too. | Raphael Moll | 2012-08-02 | 1 | -1/+15 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Fix Asset Studio tests by adding back Bugdroid clipart." | Roman Nurik | 2012-08-06 | 2 | -0/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix Asset Studio tests by adding back Bugdroid clipart. | Roman Nurik | 2012-08-06 | 2 | -0/+0 | |
* | | | | | | | Merge "Increment count when backing up bad devices.xml" | Michael Wright | 2012-08-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Increment count when backing up bad devices.xml | Michael Wright | 2012-08-06 | 1 | -1/+1 | |
* | | | | | | | | Merge "Added status bar qualifier to device schema" | Michael Wright | 2012-08-06 | 12 | -3/+49 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Added status bar qualifier to device schema | Michael Wright | 2012-08-06 | 12 | -3/+49 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge "Replace asset studio clipart with action bar icon pack." | Roman Nurik | 2012-08-06 | 328 | -0/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Replace asset studio clipart with action bar icon pack. | Roman Nurik | 2012-08-06 | 328 | -0/+0 | |
* | | | | | | | Merge "ndk: Remove redundant implementation of IShellOutputReceiver" | Siva Velusamy | 2012-08-06 | 1 | -33/+3 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | ndk: Remove redundant implementation of IShellOutputReceiver | Siva Velusamy | 2012-08-06 | 1 | -33/+3 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge "35875: Lint too strict about translating strings by default." | Tor Norbye | 2012-08-06 | 10 | -10/+172 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 35875: Lint too strict about translating strings by default. | Tor Norbye | 2012-08-06 | 10 | -10/+172 | |
|/ / / / / / | ||||||
* | | | | | | Merge "Allow lint cli --sources to specify a path, and use from ant lint" | Tor Norbye | 2012-08-06 | 8 | -89/+119 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Allow lint cli --sources to specify a path, and use from ant lint | Tor Norbye | 2012-08-06 | 8 | -89/+119 | |
* | | | | | | Merge "Add support for additional languages in the typo detector" | Tor Norbye | 2012-08-06 | 20 | -152/+7117 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Add support for additional languages in the typo detector | Tor Norbye | 2012-08-03 | 20 | -152/+7117 | |
* | | | | | | Merge "Login activity template." | Roman Nurik | 2012-08-06 | 11 | -0/+490 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Login activity template. | Roman Nurik | 2012-08-06 | 11 | -0/+490 | |
* | | | | | | | Merge "Improve Maven defaults in lint" | Tor Norbye | 2012-08-06 | 1 | -12/+38 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Improve Maven defaults in lint | Tor Norbye | 2012-08-06 | 1 | -12/+38 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge "35804: When importantForAccessibility="no" is set, don't warn" | Tor Norbye | 2012-08-06 | 3 | -2/+13 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 35804: When importantForAccessibility="no" is set, don't warn | Tor Norbye | 2012-08-03 | 3 | -2/+13 | |
* | | | | | | | Merge "Minor app template fixes." | Roman Nurik | 2012-08-06 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Minor app template fixes. | Roman Nurik | 2012-08-03 | 3 | -4/+4 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge "Fullscreen activity template." | Roman Nurik | 2012-08-06 | 14 | -0/+767 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Fullscreen activity template. | Roman Nurik | 2012-08-06 | 14 | -0/+767 | |
| |/ / / / / |