Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Restore broken CursorWindow.getType behavior. Bug: 5430009" | Jeff Brown | 2011-10-07 | 1 | -2/+4 |
|\ | |||||
| * | Restore broken CursorWindow.getType behavior. | Jeff Brown | 2011-10-07 | 1 | -2/+4 |
* | | Merge "Handle audio focus in HTML5 audio" | Michael Kolb | 2011-10-07 | 1 | -8/+46 |
|\ \ | |||||
| * | | Handle audio focus in HTML5 audio | Michael Kolb | 2011-10-07 | 1 | -8/+46 |
* | | | Merge "Stupid fixed point math. Bug #5423215" | Romain Guy | 2011-10-07 | 1 | -7/+7 |
|\ \ \ | |||||
| * | | | Stupid fixed point math. | Romain Guy | 2011-10-07 | 1 | -7/+7 |
* | | | | Merge "Fixing alarm clock bug" | Steven Ross | 2011-10-07 | 1 | -1/+16 |
|\ \ \ \ | |||||
| * | | | | Fixing alarm clock bug | Steven Ross | 2011-10-07 | 1 | -1/+16 |
* | | | | | Merge "Fix wallpaper restore" | Christopher Tate | 2011-10-07 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix wallpaper restore | Christopher Tate | 2011-10-07 | 2 | -2/+2 |
* | | | | | | Merge "Fix calc visible to account for action bar" | John Reck | 2011-10-07 | 2 | -5/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix calc visible to account for action bar | John Reck | 2011-10-06 | 2 | -5/+14 |
* | | | | | | | Merge "Turn off debug messge" | Matthew Xie | 2011-10-07 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Turn off debug messge | Matthew Xie | 2011-10-07 | 1 | -2/+1 |
* | | | | | | | | Merge "Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS... | Fabrice Di Meglio | 2011-10-07 | 6 | -247/+187 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS latest... | Fabrice Di Meglio | 2011-10-07 | 6 | -247/+187 |
* | | | | | | | | | Merge "Simplify the way we get the version info. Reduces startup overhead." | Jason Sams | 2011-10-07 | 1 | -7/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Simplify the way we get the version info. | Jason Sams | 2011-10-06 | 1 | -7/+1 |
* | | | | | | | | | | Merge "Fix bug 5399568 - ListView check states inconsistent after data set ch... | Adam Powell | 2011-10-07 | 1 | -16/+86 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix bug 5399568 - ListView check states inconsistent after data set change | Adam Powell | 2011-10-06 | 1 | -16/+86 |
* | | | | | | | | | | Merge "Specifying -1 for both low and highwater marks would not actually do t... | Andreas Huber | 2011-10-07 | 1 | -5/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Specifying -1 for both low and highwater marks would not actually do the righ... | Andreas Huber | 2011-10-07 | 1 | -5/+15 |
* | | | | | | | | | | | Merge "Add initialize method to CameraHardwareInterface" | Iliyan Malchev | 2011-10-07 | 2 | -14/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add initialize method to CameraHardwareInterface | Tyler Luu | 2011-10-07 | 2 | -14/+28 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge "Add WebViewClient.onProceededAfterSslError()" | Steve Block | 2011-10-07 | 3 | -51/+80 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add WebViewClient.onProceededAfterSslError() | Steve Block | 2011-10-07 | 3 | -51/+80 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "Allow a system property "media.stagefright.cache-params" to override c... | Andreas Huber | 2011-10-07 | 2 | -9/+65 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Allow a system property "media.stagefright.cache-params" to override cache/pr... | Andreas Huber | 2011-10-06 | 2 | -9/+65 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Reconcile with ics-factoryrom-release | The Android Open Source Project | 2011-10-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryrom | The Android Automerger | 2011-10-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge "Allow shutter/recording sound to be adjusted unless it's forced." | Chih-Chung Chang | 2011-10-07 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Allow shutter/recording sound to be adjusted unless it's forced. | Chih-Chung Chang | 2011-10-07 | 1 | -1/+12 |
* | | | | | | | | | | | | Merge "Allow Camera.setDisplayOrientation to be called when preview is active." | Wu-cheng Li | 2011-10-07 | 2 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Allow Camera.setDisplayOrientation to be called when preview is active. | Wu-cheng Li | 2011-10-07 | 2 | -4/+8 |
* | | | | | | | | | | | | | docs: Add api overview for ICS | Scott Main | 2011-10-07 | 2 | -0/+1748 |
* | | | | | | | | | | | | | Doc change: revise API diffs. | Dirk Dougherty | 2011-10-06 | 270 | -0/+57288 |
* | | | | | | | | | | | | | Revert "Doc change: add diffs for API level 14." due to api change | Scott Main | 2011-10-06 | 270 | -57326/+0 |
* | | | | | | | | | | | | | Merge "Fix an issue where we should allow negative values but did not" | James Dong | 2011-10-06 | 2 | -8/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix an issue where we should allow negative values but did not | James Dong | 2011-10-05 | 2 | -8/+8 |
* | | | | | | | | | | | | | | am a0c39e28: (-s ours) DO NOT MERGE: fix wallpaper restore | Christopher Tate | 2011-10-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | / / / / / / / / / / | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | DO NOT MERGE: fix wallpaper restore | Christopher Tate | 2011-10-06 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge "docs: deprecate thingy" | Scott Main | 2011-10-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | docs: deprecate thingy | Scott Main | 2011-10-06 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge "Trigger a full screen repaint when touching layers, as webkitDraw() ma... | Nicolas Roard | 2011-10-06 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Trigger a full screen repaint when touching layers, as webkitDraw() | Nicolas Roard | 2011-10-06 | 1 | -3/+3 |
* | | | | | | | | | | | | | | Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf" | Ying Wang | 2011-10-06 | 2 | -27/+50 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf | Ying Wang | 2011-10-06 | 2 | -27/+50 |
* | | | | | | | | | | | | | | | Merge "Docs changes for WiFiDirect sample" | Anirudh Dewani | 2011-10-06 | 3 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Docs changes for WiFiDirect sample | Anirudh Dewani | 2011-10-06 | 3 | -0/+12 |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge "Accessibility test automation API not working." | Svetoslav Ganov | 2011-10-06 | 2 | -175/+136 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |