Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Expose app resume times to the ApplicationProvider." | Mark Brophy | 2011-07-12 | 2 | -2/+38 |
|\ | |||||
| * | Expose app resume times to the ApplicationProvider. | Mark Brophy | 2011-07-10 | 2 | -2/+38 |
* | | Merge "Increase activity timeouts when using a wrapper process." | Jeff Brown | 2011-07-11 | 2 | -25/+34 |
|\ \ | |||||
| * | | Increase activity timeouts when using a wrapper process. | Jeff Brown | 2011-07-11 | 2 | -25/+34 |
* | | | Merge "Always make GL calls with a valid EGL context. Bug #5010760" | Romain Guy | 2011-07-11 | 2 | -11/+37 |
|\ \ \ | |||||
| * | | | Always make GL calls with a valid EGL context. | Romain Guy | 2011-07-11 | 2 | -11/+37 |
* | | | | Merge "Remove restricted white-listing" | Daniel Lehmann | 2011-07-11 | 1 | -41/+0 |
|\ \ \ \ | |||||
| * | | | | Remove restricted white-listing | Daniel Lehmann | 2011-07-10 | 1 | -41/+0 |
| | |_|/ | |/| | | |||||
* | | | | Merge "Set mActualScale when initialScale is set." | Shimeng (Simon) Wang | 2011-07-11 | 1 | -0/+2 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Set mActualScale when initialScale is set. | Shimeng (Simon) Wang | 2011-07-11 | 1 | -0/+2 |
* | | | | Merge "Bluetooth Health APIs" | Jaikumar Ganesh | 2011-07-11 | 7 | -99/+135 |
|\ \ \ \ | |||||
| * | | | | Bluetooth Health APIs | Jaikumar Ganesh | 2011-07-11 | 7 | -99/+135 |
* | | | | | Merge "New assets from UX for dialogs/menu frames" | Adam Powell | 2011-07-11 | 36 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | New assets from UX for dialogs/menu frames | Adam Powell | 2011-07-11 | 36 | -0/+0 |
* | | | | | | Merge "Eliminate single-process mode. Bug: 5010576" | Jeff Brown | 2011-07-11 | 7 | -118/+27 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Eliminate single-process mode. | Jeff Brown | 2011-07-08 | 7 | -118/+27 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge "SDK_INT is not "current" on unreleased builds." | Elliott Hughes | 2011-07-11 | 1 | -4/+0 |
|\ \ \ \ \ | |||||
| * | | | | | SDK_INT is not "current" on unreleased builds. | Elliott Hughes | 2011-07-10 | 1 | -4/+0 |
* | | | | | | Merge "Relocate common Calendar classes" | Andy McFadden | 2011-07-11 | 5 | -2898/+0 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Relocate common Calendar classes | Andy McFadden | 2011-07-08 | 5 | -2898/+0 |
* | | | | | | Merge "Fix View reset of layoutDirection and textDirection" | Fabrice Di Meglio | 2011-07-11 | 8 | -26/+131 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix View reset of layoutDirection and textDirection | Fabrice Di Meglio | 2011-07-11 | 8 | -26/+131 |
* | | | | | | | Merge "remove old style button bar look" | Freeman Ng | 2011-07-11 | 9 | -26/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remove old style button bar look | Freeman Ng | 2011-07-10 | 9 | -26/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file ... | Mike Lockwood | 2011-07-11 | 2 | -4/+22 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system | Mike Lockwood | 2011-07-11 | 2 | -4/+22 |
| |/ / / / / | |||||
* | | | | | | Cached NTP time for system services. | Jeff Sharkey | 2011-07-10 | 3 | -10/+60 |
|/ / / / / | |||||
* | | | | | Merge "Pass the targetSdkVersion through to the zygote-forked dalvik." | Elliott Hughes | 2011-07-08 | 5 | -25/+63 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Pass the targetSdkVersion through to the zygote-forked dalvik. | Elliott Hughes | 2011-07-08 | 5 | -25/+63 |
* | | | | | Merge "resolved conflicts for merge of e4a56a32 to master" | Wink Saville | 2011-07-08 | 2 | -6/+25 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | resolved conflicts for merge of e4a56a32 to master | Wink Saville | 2011-07-08 | 2 | -6/+25 |
| |\ \ \ \ | |||||
| | * \ \ \ | am 8171e6f6: Use resetConnections with resetMask. | Wink Saville | 2011-07-08 | 2 | -6/+25 |
| | |\ \ \ \ | |||||
| | | * | | | | Use resetConnections with resetMask. | Wink Saville | 2011-07-07 | 2 | -6/+25 |
* | | | | | | | Merge "Prevent set mInitialScale being overridden by mDefaultScale." | Shimeng (Simon) Wang | 2011-07-08 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Prevent set mInitialScale being overridden by mDefaultScale. | Shimeng (Simon) Wang | 2011-07-08 | 1 | -2/+3 |
* | | | | | | | | Merge "Fleshed up SuggestionSpan documentation. Bug 4553472" | Gilles Debunne | 2011-07-08 | 1 | -3/+13 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Fleshed up SuggestionSpan documentation. Bug 4553472 | Gilles Debunne | 2011-07-08 | 1 | -3/+13 |
* | | | | | | | | Merge "Always redraw the UI on orientation change Bug #4994715" | Romain Guy | 2011-07-08 | 2 | -19/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Always redraw the UI on orientation change | Romain Guy | 2011-07-08 | 2 | -19/+39 |
* | | | | | | | | | The COLORS!! | Adam Powell | 2011-07-08 | 12 | -52/+101 |
* | | | | | | | | | Merge "Unhide CalendarContract apis" | RoboErik | 2011-07-08 | 1 | -8/+80 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Unhide CalendarContract apis | RoboErik | 2011-07-08 | 1 | -8/+80 |
* | | | | | | | | | | Merge "Get server's listening channel" | Jaikumar Ganesh | 2011-07-08 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Get server's listening channel | Ben Dodson | 2011-07-08 | 1 | -0/+10 |
* | | | | | | | | | | Merge "Pseudo-final api fixes to CalendarContract" | RoboErik | 2011-07-08 | 1 | -29/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Pseudo-final api fixes to CalendarContract | RoboErik | 2011-07-08 | 1 | -29/+16 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "Can now restore a subset of apps from historical dataset" | Christopher Tate | 2011-07-08 | 2 | -0/+53 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Can now restore a subset of apps from historical dataset | Christopher Tate | 2011-07-08 | 2 | -0/+53 |
* | | | | | | | | | | | Merge "NPE guard in setupViewport" | John Reck | 2011-07-08 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | NPE guard in setupViewport | John Reck | 2011-07-08 | 1 | -0/+4 |