summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix the float Rect in OpenGLRenderer to handle NANsMathias Agopian2011-09-191-1/+1
* Merge "TextLayoutCacheKey needs to store start and count."Jeff Brown2011-09-190-0/+0
|\
* \ am 6c038506: Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into i...Jean-Michel Trivi2011-09-190-0/+0
|\ \
| * \ Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryromJean-Michel Trivi2011-09-190-0/+0
| |\ \
* | \ \ Merge "Disable extract mode in find on page"John Reck2011-09-190-0/+0
|\ \ \ \
* \ \ \ \ Merge "Speeding up Recent Apps"Michael Jurka2011-09-190-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
* | | | | am c6939697: Merge "Remove isAnyActiveDataConnection and promote isDisconnect...Wink Saville2011-09-190-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics...Wink Saville2011-09-190-0/+0
| |\ \ \ \
* | \ \ \ \ Merge "TextLayoutCache code refactoring"Fabrice Di Meglio2011-09-190-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ am f946c282: Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryromWink Saville2011-09-190-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryromWink Saville2011-09-190-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
* | | | | | | Merge "fix EGL debugger"Mathias Agopian2011-09-198-33/+29
|\ \ \ \ \ \ \
| * | | | | | | fix EGL debuggerMathias Agopian2011-09-198-33/+29
* | | | | | | | am 2c2ab586: Fix issue #5260129: Suggestion strip in Talk app not showing all...Dianne Hackborn2011-09-190-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | |
* | | | | | | am d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent()Fred Quintana2011-09-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
* | | | | | | Merge "Maybe fix issue #5340190: java.lang.RuntimeException: Unable to start..."Dianne Hackborn2011-09-190-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in ...Andreas Huber2011-09-190-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Update code to use location aware isEmergencyNumber."David Brown2011-09-190-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "Return the bundle object"David Hu2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge "Fix potential leak in TextLayouCache"Fabrice Di Meglio2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Make TextLayoutCache no more dependent on ICU"Fabrice Di Meglio2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
* | | | | | | | | | | Merge "Bringing back the 'cache"John Reck2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "Bug 5290461: change voice IME underline span color"Gilles Debunne2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | am 79a33ad4: Merge "Continuation of the unified account chooser flow." into i...Fred Quintana2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge "Continuation of the unified account chooser flow." into ics-factoryromFred Quintana2011-09-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge "Fix issue #5260129: Suggestion strip in Talk app not showing all the t...Dianne Hackborn2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ am b0a1f197: Merge "Added "No recent apps" message on phones" into ics-factor...Michael Jurka2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| / / / / / / / / / / / / | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Added "No recent apps" message on phones" into ics-factoryromMichael Jurka2011-09-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fix for http://b/issue?id=5297155"Philip Milne2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Make Volume control non-modal and allow touches underneath to take eff...Amith Yamasani2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2f153169: Merge "Bug 5300223 RemoteControlClient uses PendingIntent for me...Jean-Michel Trivi2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button ev...Jean-Michel Trivi2011-09-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"Adam Powell2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "In order to recover from video lagging behind audio, drop avc frames"Andreas Huber2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Sample atomic network stats buckets, full poll."Jeff Sharkey2011-09-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics...Justin Ho2011-09-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Properly adding scrubber pressed/selected state" into ics-factoryromJustin Ho2011-09-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Fix bug 5279720 - Legacy theme EditText coloring"Adam Powell2011-09-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | / / / / / / / | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats bucke...Jeff Sharkey2011-09-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ic...Jeff Sharkey2011-09-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryromJeff Sharkey2011-09-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Collect and persist tethering stats." into ics-factoryromJeff Sharkey2011-09-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | / / / / / / / / / / | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode"Adam Powell2011-09-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix issue #5242779: Device not responding to touch on unlock screen"Dianne Hackborn2011-09-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Retain DNS information from DHCP request"Irfan Sheriff2011-09-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Revert "Fix bug #5332081 TextLayoutCache needs to be able to have more...Fabrice Di Meglio2011-09-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "doc change: fix attr name"Dirk Dougherty2011-09-170-0/+0