summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Final icon for (Day)dreams.Daniel Sandler2012-10-268-2/+2
* Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into...Bryan Mawhinney2012-10-251-0/+3
|\
| * Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)Bryan Mawhinney2012-10-241-0/+3
* | Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-devDianne Hackborn2012-10-243-4/+15
|\ \
| * | Fix issue #7408647: Add getUserCount() APIDianne Hackborn2012-10-243-4/+15
* | | Merge changes Ia0c2450f,I0fac062f into jb-mr1-devDaniel Sandler2012-10-246-5/+99
|\ \ \
| * | | Be a little more lenient with panel-open gestures.Daniel Sandler2012-10-241-4/+2
| * | | Missing copyright headers.Daniel Sandler2012-10-246-1/+97
* | | | Merge "Handle group tear down only at group removed event" into jb-mr1-devIrfan Sheriff2012-10-241-3/+11
|\ \ \ \
| * | | | Handle group tear down only at group removed eventIrfan Sheriff2012-10-241-3/+11
| | |/ / | |/| |
* | | | Merge "Dim the screen quickly in response to user activity timeout." into jb-...Jeff Brown2012-10-241-2/+2
|\ \ \ \
| * | | | Dim the screen quickly in response to user activity timeout.Jeff Brown2012-10-241-2/+2
* | | | | Merge "Ensure we have a GL context before deleting View layers Bug #7391098" ...Romain Guy2012-10-241-24/+29
|\ \ \ \ \
| * | | | | Ensure we have a GL context before deleting View layersRomain Guy2012-10-231-24/+29
* | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-2449-51/+72
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-2449-51/+72
* | | | | | Merge "Fix a crash in InputMethodManagerService due to permission failure." i...Amith Yamasani2012-10-241-1/+6
|\ \ \ \ \ \
| * | | | | | Fix a crash in InputMethodManagerService due to permission failure.Amith Yamasani2012-10-241-1/+6
* | | | | | | Merge "revise android.location.Geofence documentation" into jb-mr1-devVictoria Lease2012-10-241-3/+1
|\ \ \ \ \ \ \
| * | | | | | | revise android.location.Geofence documentationVictoria Lease2012-10-241-3/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Fix the Backup Manager's uninstall tracking" into jb-mr1-devChristopher Tate2012-10-241-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix the Backup Manager's uninstall trackingChristopher Tate2012-10-231-8/+8
* | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-243-9/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-10-243-9/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Secure windows, secure surface views and secure displays." into jb-mr1...Jeff Brown2012-10-249-17/+99
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Secure windows, secure surface views and secure displays.Jeff Brown2012-10-239-17/+99
* | | | | | | | Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1...Zhihai Xu2012-10-248-8/+106
|\ \ \ \ \ \ \ \
| * | | | | | | | License of files Bluetooth package is not updated to ASL2Zhihai Xu2012-10-238-8/+106
* | | | | | | | | am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing pag...Dirk Dougherty2012-10-241-92/+77
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.Dirk Dougherty2012-10-241-92/+77
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 76cdbdc8: Doc change: update develop landing page content.Dirk Dougherty2012-10-241-92/+77
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Doc change: update develop landing page content.Dirk Dougherty2012-10-241-92/+77
* | | | | | | | | | | | Merge "Fix issue #7401818: Wrong transition animation when clearing task" int...Dianne Hackborn2012-10-242-1/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix issue #7401818: Wrong transition animation when clearing taskDianne Hackborn2012-10-232-1/+48
* | | | | | | | | | | | Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-devDave Burke2012-10-233-181/+140
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Revert "Check non-primary user dirs during package scan"Dave Burke2012-10-233-181/+140
* | | | | | | | | | | | Merge "AudioService: add fix for corrupted settings" into jb-mr1-devEric Laurent2012-10-231-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | AudioService: add fix for corrupted settingsEric Laurent2012-10-231-0/+6
* | | | | | | | | | | | | PMS: check outInfo for null during deleteKenny Root2012-10-231-1/+1
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-devDianne Hackborn2012-10-232-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix issue #7342364: JellyBean broke Toddler Lock, againDianne Hackborn2012-10-232-2/+4
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "When A11y is on, use a longer interval between lockout announcements."...Svetoslav Ganov2012-10-231-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | When A11y is on, use a longer interval between lockout announcements.alanv2012-10-231-1/+17
* | | | | | | | | | | | | Merge "Check non-primary user dirs during package scan" into jb-mr1-devKenny Root2012-10-233-140/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Check non-primary user dirs during package scanKenny Root2012-10-223-140/+181
* | | | | | | | | | | | | Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-devCraig Mautner2012-10-237-26/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add throwing InvalidDisplayException from addView.Craig Mautner2012-10-237-26/+78
* | | | | | | | | | | | | | Merge "Fix NPE." into jb-mr1-devHiroshi Lockheimer2012-10-231-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix NPE.Daniel Sandler2012-10-231-1/+3
* | | | | | | | | | | | | | | Merge "Handle offscreen animations correctly" into jb-mr1-devChet Haase2012-10-232-16/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \