summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Restore broken CursorWindow.getType behavior. Bug: 5430009"Jeff Brown2011-10-071-2/+4
|\
| * Restore broken CursorWindow.getType behavior.Jeff Brown2011-10-071-2/+4
* | Merge "Handle audio focus in HTML5 audio"Michael Kolb2011-10-071-8/+46
|\ \
| * | Handle audio focus in HTML5 audioMichael Kolb2011-10-071-8/+46
* | | Merge "Stupid fixed point math. Bug #5423215"Romain Guy2011-10-071-7/+7
|\ \ \
| * | | Stupid fixed point math.Romain Guy2011-10-071-7/+7
* | | | Merge "Fixing alarm clock bug"Steven Ross2011-10-071-1/+16
|\ \ \ \
| * | | | Fixing alarm clock bugSteven Ross2011-10-071-1/+16
* | | | | Merge "Fix wallpaper restore"Christopher Tate2011-10-072-2/+2
|\ \ \ \ \
| * | | | | Fix wallpaper restoreChristopher Tate2011-10-072-2/+2
* | | | | | Merge "Fix calc visible to account for action bar"John Reck2011-10-072-5/+14
|\ \ \ \ \ \
| * | | | | | Fix calc visible to account for action barJohn Reck2011-10-062-5/+14
* | | | | | | Merge "Turn off debug messge"Matthew Xie2011-10-071-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Turn off debug messgeMatthew Xie2011-10-071-2/+1
* | | | | | | | Merge "Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS...Fabrice Di Meglio2011-10-076-247/+187
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS latest...Fabrice Di Meglio2011-10-076-247/+187
* | | | | | | | | Merge "Simplify the way we get the version info. Reduces startup overhead."Jason Sams2011-10-071-7/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simplify the way we get the version info.Jason Sams2011-10-061-7/+1
* | | | | | | | | | Merge "Fix bug 5399568 - ListView check states inconsistent after data set ch...Adam Powell2011-10-071-16/+86
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix bug 5399568 - ListView check states inconsistent after data set changeAdam Powell2011-10-061-16/+86
* | | | | | | | | | Merge "Specifying -1 for both low and highwater marks would not actually do t...Andreas Huber2011-10-071-5/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Specifying -1 for both low and highwater marks would not actually do the righ...Andreas Huber2011-10-071-5/+15
* | | | | | | | | | | Merge "Add initialize method to CameraHardwareInterface"Iliyan Malchev2011-10-072-14/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add initialize method to CameraHardwareInterfaceTyler Luu2011-10-072-14/+28
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Add WebViewClient.onProceededAfterSslError()"Steve Block2011-10-073-51/+80
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add WebViewClient.onProceededAfterSslError()Steve Block2011-10-073-51/+80
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge "Allow a system property "media.stagefright.cache-params" to override c...Andreas Huber2011-10-072-9/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow a system property "media.stagefright.cache-params" to override cache/pr...Andreas Huber2011-10-062-9/+65
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-10-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-060-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge "Allow shutter/recording sound to be adjusted unless it's forced."Chih-Chung Chang2011-10-071-1/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow shutter/recording sound to be adjusted unless it's forced.Chih-Chung Chang2011-10-071-1/+12
* | | | | | | | | | | | Merge "Allow Camera.setDisplayOrientation to be called when preview is active."Wu-cheng Li2011-10-072-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow Camera.setDisplayOrientation to be called when preview is active.Wu-cheng Li2011-10-072-4/+8
* | | | | | | | | | | | | docs: Add api overview for ICSScott Main2011-10-072-0/+1748
* | | | | | | | | | | | | Doc change: revise API diffs.Dirk Dougherty2011-10-06270-0/+57288
* | | | | | | | | | | | | Revert "Doc change: add diffs for API level 14." due to api changeScott Main2011-10-06270-57326/+0
* | | | | | | | | | | | | Merge "Fix an issue where we should allow negative values but did not"James Dong2011-10-062-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix an issue where we should allow negative values but did notJames Dong2011-10-052-8/+8
* | | | | | | | | | | | | | am a0c39e28: (-s ours) DO NOT MERGE: fix wallpaper restoreChristopher Tate2011-10-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | / / / / / / / / / / | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | DO NOT MERGE: fix wallpaper restoreChristopher Tate2011-10-061-1/+1
* | | | | | | | | | | | | Merge "docs: deprecate thingy"Scott Main2011-10-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | docs: deprecate thingyScott Main2011-10-061-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Trigger a full screen repaint when touching layers, as webkitDraw() ma...Nicolas Roard2011-10-061-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Trigger a full screen repaint when touching layers, as webkitDraw()Nicolas Roard2011-10-061-3/+3
* | | | | | | | | | | | | | Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf"Ying Wang2011-10-062-27/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Make symlinks for DroidSans.ttf and DroidSans-Bold.ttfYing Wang2011-10-062-27/+50
* | | | | | | | | | | | | | | Merge "Docs changes for WiFiDirect sample"Anirudh Dewani2011-10-063-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Docs changes for WiFiDirect sampleAnirudh Dewani2011-10-063-0/+12
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Accessibility test automation API not working."Svetoslav Ganov2011-10-062-175/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \