summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge from open-source masterThe Android Open Source Project2010-04-211-7/+10
|\
| * Allow META* macros outside of the frameworkMichael Richardson2010-04-201-7/+10
* | am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work...Mathias Agopian2010-04-201-54/+39
|\ \
| * | DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <...Mathias Agopian2010-04-201-54/+39
* | | am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyoJeff Brown2010-04-200-0/+0
|\ \ \ | |/ /
| * | Merge "Fix PM crash due to bad array bookkeeping logic." into froyoJeff Brown2010-04-200-0/+0
| |\ \
* | \ \ am be348964: Merge "Move Tethering off the ServerThread." into froyoRobert Greenwalt2010-04-200-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Move Tethering off the ServerThread." into froyoRobert Greenwalt2010-04-200-0/+0
| |\ \ \
* | \ \ \ am 9e609b0d: Merge "Apparently select() does not immediately return if one of...Andreas Huber2010-04-200-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Apparently select() does not immediately return if one of the masked s...Andreas Huber2010-04-200-0/+0
| |\ \ \ \
* | \ \ \ \ am fe8620ac: Merge "Update AudioService to reflect phone state changes with A...Jean-Michel Trivi2010-04-200-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Update AudioService to reflect phone state changes with AudioFocus. Ph...Jean-Michel Trivi2010-04-200-0/+0
| |\ \ \ \ \ | | |/ / / /
* | | | | | am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when s...Suchi Amalapurapu2010-04-200-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mo...Suchi Amalapurapu2010-04-200-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data int...Andreas Huber2010-04-200-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Don't coalesce more than 250ms worth of encoded data into a single cod...Andreas Huber2010-04-200-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | am 8ccbd4ba: Merge "Fix bug 2604132 40s skip after undocking In case of A2DP ...Jean-Michel Trivi2010-04-201-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors,...Jean-Michel Trivi2010-04-201-1/+1
| |\ \ \ \ \
| | * | | | | Fix bug 2604132 40s skip after undockingJean-Michel Trivi2010-04-201-1/+1
| | | |/ / / | | |/| | |
* | | | | | am b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pi...Nicolas Roard2010-04-200-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Speed up layers rendering when using animations Cherry-pick from maste...Nicolas Roard2010-04-200-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | am c96307ef: Merge "Make the silent/vibrate status icon reflect overall devic...Daniel Sandler2010-04-200-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Make the silent/vibrate status icon reflect overall device state. (DO ...Daniel Sandler2010-04-200-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag t...Carl Shapiro2010-04-200-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." in...Carl Shapiro2010-04-200-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | am 738a0460: Merge "Don\'t inflate the zoom button controller until we are go...Grace Kloba2010-04-200-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Don't inflate the zoom button controller until we are going to show it...Grace Kloba2010-04-200-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
* | | | | am 9b8b417c: Merge "When updating existing entries in the media database, don...Marco Nelissen2010-04-200-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "When updating existing entries in the media database, don't update the...Marco Nelissen2010-04-200-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.Eric Laurent2010-04-200-0/+0
|\ \ \ \ \ | |/ / / /
* | | | | am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profi...Eric Laurent2010-04-200-0/+0
|\ \ \ \ \ | |/ / / /
* | | | | am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a vide...Mathias Agopian2010-04-194-28/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "fix [2599939] "cannot play video" after open/close a video player a do...Mathias Agopian2010-04-194-28/+2
| |\ \ \ \
| | * | | | fix [2599939] "cannot play video" after open/close a video player a dozen of ...Mathias Agopian2010-04-194-28/+2
* | | | | | am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyoJack Palevich2010-04-190-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyoJack Palevich2010-04-190-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am c86f0779: Make vCard allow users to refrain image export. Useful when rece...Daisuke Miyakawa2010-04-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
* | | | | | | am 8f655cb6: Merge "Update the comment which supposed to be checked in in the...Grace Kloba2010-04-190-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Update the comment which supposed to be checked in in the last CL." in...Grace Kloba2010-04-190-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am 93d35f77: Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view...Adam Powell2010-04-190-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visi...Adam Powell2010-04-190-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | am f06f2eb2: Merge "Misc fixes for throttling." into froyoRobert Greenwalt2010-04-190-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Misc fixes for throttling." into froyoRobert Greenwalt2010-04-190-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | am 2dc78498: Merge "Remove fixed size restriction on the SurfaceView before s...Grace Kloba2010-04-190-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Remove fixed size restriction on the SurfaceView before setting it to ...Grace Kloba2010-04-190-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | am 5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" ...Scott Main2010-04-190-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "add droiddoc flag to include since-tags for api level 8" into froyoScott Main2010-04-190-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | am 11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronizat...Brad Fitzpatrick2010-04-190-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Reduce lock contention, removing unnecessary synchronization." into froyoBrad Fitzpatrick2010-04-190-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ am 99c5179f: Merge "Force redraw in touch_up if there is a move." into froyoGrace Kloba2010-04-190-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /