summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge "Adding accessibility support to the pattern lock."Svetoslav Ganov2011-10-102-17/+79
|\ \ \ \ \ \
| * | | | | | Adding accessibility support to the pattern lock.Svetoslav Ganov2011-10-102-17/+79
* | | | | | | Merge "Add "format" extra to SMS delivery report intents."Jake Hamby2011-10-102-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Add "format" extra to SMS delivery report intents.Jake Hamby2011-10-102-0/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Gracefully handle "needs init" transport errors at finish"Christopher Tate2011-10-101-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Gracefully handle "needs init" transport errors at finishChristopher Tate2011-10-101-0/+9
* | | | | | | | Resolved conflicts for merge of 83cf0313 to masterJustin Ho2011-10-107-8/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge "Ensuring previous sounds are named correctly Bug: 5416299" into ics-fa...Hiroshi Lockheimer2011-10-107-8/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Ensuring previous sounds are named correctlyJustin Ho2011-10-107-8/+6
* | | | | | | | | Merge "Don't show icon for power-off confirmation dialog."Amith Yamasani2011-10-101-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't show icon for power-off confirmation dialog.Amith Yamasani2011-10-101-1/+0
* | | | | | | | | | Merge "Fix 5406921: Register for receiving phone state changes when KGSVM get...Jim Miller2011-10-101-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix 5406921: Register for receiving phone state changes when KGSVM gets created.Jim Miller2011-10-071-0/+3
* | | | | | | | | | | Merge "Fixes 5429869 Only displaying FaceUnlock when window is focused"Steven Ross2011-10-101-9/+30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixes 5429869 Only displaying FaceUnlock when window is focusedSteven Ross2011-10-101-9/+30
* | | | | | | | | | | Merge "Fix issue #5405788: Device continuously opening and closing..."Dianne Hackborn2011-10-109-37/+79
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix issue #5405788: Device continuously opening and closing...Dianne Hackborn2011-10-109-37/+79
* | | | | | | | | | | | Merge "Accessibility text changed event text not populated."Svetoslav Ganov2011-10-102-10/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Accessibility text changed event text not populated.Svetoslav Ganov2011-10-102-10/+2
* | | | | | | | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-10-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Don't call saveLayer() when it's not required Bug #5435653"Romain Guy2011-10-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't call saveLayer() when it's not requiredRomain Guy2011-10-101-1/+1
* | | | | | | | | | | | | Merge "Support AMR as a file type so that it can be imported into movie studio"James Dong2011-10-103-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Support AMR as a file type so that it can be imported into movie studioJames Dong2011-10-093-3/+8
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Bug 5437846: Crash in SpellChecker"Gilles Debunne2011-10-101-41/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Bug 5437846: Crash in SpellCheckerGilles Debunne2011-10-101-41/+46
* | | | | | | | | | | | | am 832c5485: Merge "Update screen lock/unlock sound Bug: 5416299" into ics-fa...Justin Ho2011-10-104-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryromJustin Ho2011-10-104-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update screen lock/unlock soundJustin Ho2011-10-104-0/+0
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | am 17249d64: Adding Pollux notification tone Bug: 5416299Justin Ho2011-10-102-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Adding Pollux notification toneJustin Ho2011-10-102-0/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 9e7caa0b: Tie the lockscreen sounds with the ringer volume.Amith Yamasani2011-10-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Tie the lockscreen sounds with the ringer volume.Amith Yamasani2011-10-091-3/+32
* | | | | | | | | | | | am 803ce0f9: (-s ours) Use SoundPool instead of Ringtone.Marco Nelissen2011-10-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Use SoundPool instead of Ringtone.Marco Nelissen2011-10-091-25/+27
* | | | | | | | | | | | Merge "Make sure we have the correct GL context when grabbing a bitmap Bug #5...Romain Guy2011-10-102-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Make sure we have the correct GL context when grabbing a bitmapRomain Guy2011-10-102-0/+22
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Fix ownership of CursorWindows across processes. Bug: 5332296"Jeff Brown2011-10-1014-310/+376
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix ownership of CursorWindows across processes.Jeff Brown2011-10-0914-310/+376
* | | | | | | | | | | | Merge "Delay sending Plugin Draw event until the surface is ready."Derek Sollenberger2011-10-102-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Delay sending Plugin Draw event until the surface is ready.Derek Sollenberger2011-10-102-0/+11
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Improve loadData JavaDoc"John Reck2011-10-101-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Improve loadData JavaDocJohn Reck2011-10-101-1/+2
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "YouTube can now request custom cache/prefetch parameters and disconnec...Andreas Huber2011-10-103-4/+76
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | YouTube can now request custom cache/prefetch parameters and disconnect-at-hi...Andreas Huber2011-10-103-4/+76
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "enable EGL_IMG_context_priority for the omap4 platform"Mathias Agopian2011-10-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | enable EGL_IMG_context_priority for the omap4 platformMathias Agopian2011-10-071-0/+3
* | | | | | | | | | | | Merge "Fix Cursor leak in SettingsBackupAgent. Bug: 5434060"Jeff Brown2011-10-101-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix Cursor leak in SettingsBackupAgent.Jeff Brown2011-10-091-5/+10