Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid ... | Adam Powell | 2011-06-07 | 1 | -0/+9 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams... | Adam Powell | 2011-06-07 | 1 | -0/+9 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Fix bug 4533120 - rough handling of invalid event streams in | Adam Powell | 2011-06-07 | 1 | -0/+9 | |
* | | | | | | | | | | | Merge "Bug 4563099 - Action bar tabs - place second row tabs on top in the ab... | Adam Powell | 2011-06-09 | 1 | -5/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Bug 4563099 - Action bar tabs - place second row tabs on top in the | Adam Powell | 2011-06-09 | 1 | -5/+26 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge "Don't cut velocity" | John Reck | 2011-06-09 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Don't cut velocity | John Reck | 2011-06-09 | 1 | -5/+0 | |
* | | | | | | | | | | | Merge "Add SwitchPreference" | Gilles Debunne | 2011-06-09 | 4 | -268/+499 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add SwitchPreference | Adam Powell | 2011-06-08 | 4 | -268/+499 | |
* | | | | | | | | | | | | Merge "Persist network stats using AtomicFile." | Jeff Sharkey | 2011-06-09 | 4 | -7/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Persist network stats using AtomicFile. | Jeff Sharkey | 2011-06-09 | 4 | -7/+42 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge "Fixes WebView.loadData() to avoid constructing invalid URLs." | Steve Block | 2011-06-09 | 1 | -13/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fixes WebView.loadData() to avoid constructing invalid URLs. | Steve Block | 2011-06-09 | 1 | -13/+22 | |
* | | | | | | | | | | | | | Merge "Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes." | Narayan Kamath | 2011-06-09 | 7 | -81/+270 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes. | Narayan Kamath | 2011-06-09 | 7 | -81/+270 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge "Change exception thrown when set() called on readonly Property." | Chet Haase | 2011-06-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Change exception thrown when set() called on readonly Property. | Chet Haase | 2011-06-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge "Fix for baseline alignment in LinearLayout compatibiity mode." | Philip Milne | 2011-06-09 | 1 | -126/+148 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix for baseline alignment in LinearLayout compatibiity mode. | Philip Milne | 2011-06-09 | 1 | -126/+148 | |
* | | | | | | | | | | | | | | am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEn... | Romain Guy | 2011-06-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | / / / / / | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) ... | Romain Guy | 2011-06-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." | Romain Guy | 2011-06-06 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | Disable plugins if setPluginsEnabled(false) called. | Tero Saarni | 2011-06-02 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge "Added support for rediscovering a Tag (API)." | Martijn Coenen | 2011-06-09 | 2 | -0/+48 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Added support for rediscovering a Tag (API). | Martijn Coenen | 2011-06-08 | 2 | -0/+48 | |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge "Add a URI for recurring event exceptions" | Andy McFadden | 2011-06-09 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add a URI for recurring event exceptions | Andy McFadden | 2011-06-08 | 1 | -0/+8 | |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge "Make changes to the TTS api suggested by the API review." | Narayan Kamath | 2011-06-09 | 6 | -139/+229 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Make changes to the TTS api suggested by the API review. | Narayan Kamath | 2011-06-08 | 6 | -139/+229 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge "Fix some poorly worded API documentation for WebView.loadDataWithBaseU... | Steve Block | 2011-06-09 | 2 | -17/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix some poorly worded API documentation for WebView.loadDataWithBaseURL() | Steve Block | 2011-06-09 | 2 | -17/+10 | |
* | | | | | | | | | | | | | | resolved conflicts for merge of 7ca13deb to master | Jake Hamby | 2011-06-08 | 1 | -2/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp | Jake Hamby | 2011-06-07 | 1 | -2/+42 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp | Jake Hamby | 2011-06-06 | 1 | -2/+42 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | Enable full support for SMS Cell Broadcast. | Jake Hamby | 2011-06-01 | 1 | -2/+42 | |
| | * | | | | | | | | | | | | | am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into g... | Jaikumar Ganesh | 2011-05-27 | 1 | -15/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | Remove discoverable timeout handler. DO NOT MERGE | Jaikumar Ganesh | 2011-05-27 | 1 | -15/+1 | |
* | | | | | | | | | | | | | | | Merge "Introduces new Contacts API for ranking promotion." | Daisuke Miyakawa | 2011-06-08 | 1 | -0/+85 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Introduces new Contacts API for ranking promotion. | Daisuke Miyakawa | 2011-06-08 | 1 | -0/+85 | |
* | | | | | | | | | | | | | | | | Merge "AccessibilityNodeInfo and AccessibilityEvent to initialized properly." | Svetoslav Ganov | 2011-06-08 | 2 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | AccessibilityNodeInfo and AccessibilityEvent to initialized properly. | Svetoslav Ganov | 2011-06-08 | 2 | -5/+6 | |
* | | | | | | | | | | | | | | | | Merge "Fix initial zoom with loadViewState" | John Reck | 2011-06-08 | 1 | -10/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fix initial zoom with loadViewState | John Reck | 2011-06-08 | 1 | -10/+21 | |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Remove obsolete code. | Romain Guy | 2011-06-08 | 1 | -13/+0 | |
| |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE | John Wang | 2011-06-08 | 1 | -1/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE | John Wang | 2011-06-07 | 1 | -1/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge "Add SIM PUK unlockscreen." into honeycomb-LTE | John Wang | 2011-06-07 | 1 | -1/+23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Add SIM PUK unlockscreen. | John Wang | 2011-06-07 | 1 | -1/+23 | |
* | | | | | | | | | | | | | | The service part of the user space VPN support. | Chia-chi Yeh | 2011-06-08 | 2 | -0/+49 | |
| |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge "Move NDEF URI helper method into android.nfc.NfcRecord" | Nick Pelly | 2011-06-08 | 1 | -0/+91 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |