summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 27eecb70 to gingerbreadJean-Baptiste Queru2010-07-309-9/+5
|\
| * Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base...The Android Open Source Project2010-07-299-9/+5
| |\
| | * fix inaccurate copyrightsJean-Baptiste Queru2010-07-299-9/+5
* | | am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" docume...Gilles Debunne2010-07-301-6/+5
|\ \ \ | |/ /
| * | Merge "Fixes regarding densities in "Providing Resources" documentation page....Gilles Debunne2010-07-291-6/+5
| |\ \
| | * | Fixes regarding densities in "Providing Resources" documentation page.Gilles Debunne2010-07-291-6/+5
* | | | am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." int...Gilles Debunne2010-07-302-17/+14
|\ \ \ \ | |/ / /
| * | | Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyoGilles Debunne2010-07-292-17/+14
| |\ \ \
| | * | | Fixed doc typos in HeterogeneousExpandableList.java.Gilles Debunne2010-07-292-17/+14
| | |/ /
* | | | Merge "Update Context.getSystemService() docs for download manager." into gin...Steve Howard2010-07-301-0/+4
|\ \ \ \
| * | | | Update Context.getSystemService() docs for download manager.Steve Howard2010-07-281-0/+4
* | | | | Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.Eric Laurent2010-07-303-63/+124
* | | | | Merge "fix [2870926] Issue 9802: EGL wrapper has not been implemented correct...Mathias Agopian2010-07-291-98/+138
|\ \ \ \ \
| * | | | | fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for ...Mathias Agopian2010-07-261-98/+138
* | | | | | Added SensorManager.getAltitude()Mathias Agopian2010-07-292-7/+56
* | | | | | Added SensorManager.getMinDelay()Mathias Agopian2010-07-2910-11/+61
* | | | | | am 392edec1: Merge from open-source froyoThe Android Open Source Project2010-07-290-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge from open-source froyoThe Android Open Source Project2010-07-291-2/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fix a bug where we cleaned an apps external data when upgrading it. :(Dianne Hackborn2010-07-291-2/+1
* | | | | | Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(...Dianne Hackborn2010-07-291-2/+1
|\ \ \ \ \ \
| * | | | | | Fix a bug where we cleaned an apps external data when upgrading it. :(Dianne Hackborn2010-07-291-2/+1
* | | | | | | Merge "Attempt to fix the SDK build" into gingerbreadChristopher Tate2010-07-291-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Attempt to fix the SDK buildChristopher Tate2010-07-291-4/+4
* | | | | | | | Fix touch input in landscape mode.Jeff Brown2010-07-291-4/+4
* | | | | | | | DO NOT MERGE: Fix input event injection ANRs on UI thread.Jeff Brown2010-07-2913-204/+379
|/ / / / / / /
* | | | | | | am 16263d9f: Squashed commit of the following:Andreas Huber2010-07-291-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Squashed commit of the following:Andreas Huber2010-07-294-48/+136
| | |_|_|_|/ | |/| | | |
* | | | | | Fix typo in GPS mode logic.Mike Lockwood2010-07-291-1/+1
* | | | | | Fixed underrun in audioflinger mixer.Eric Laurent2010-07-291-2/+2
* | | | | | Allow creation of an audio effect on a session with no audio tracks.Eric Laurent2010-07-292-16/+72
* | | | | | Merge "Change unistd.h to stddef.h to be correct" into gingerbreadChris Tate2010-07-281-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Change unistd.h to stddef.h to be correctKenny Root2010-07-281-1/+1
* | | | | | Merge "Fix a bug that could cause flings to last too long using a Scroller" i...Adam Powell2010-07-281-1/+5
|\ \ \ \ \ \
| * | | | | | Fix a bug that could cause flings to last too long using a ScrollerAdam Powell2010-07-281-1/+5
* | | | | | | Merge "Add stdint.h to fix sim-eng" into gingerbreadKenny Root2010-07-281-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Add stdint.h to fix sim-engKenny Root2010-07-281-0/+1
* | | | | | Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbreadKenny Root2010-07-281-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add unistd.h for size_t typedef to fix sim-engKenny Root2010-07-281-0/+1
* | | | | | Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. canno...Mathias Agopian2010-07-285-60/+78
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot deque...Mathias Agopian2010-07-275-60/+78
| | |_|/ / | |/| | |
* | | | | Merge "Support streaming of compressed assets > 1 megabyte" into gingerbreadChristopher Tate2010-07-2811-39/+573
|\ \ \ \ \
| * | | | | Support streaming of compressed assets > 1 megabyteChristopher Tate2010-07-2811-39/+573
* | | | | | Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gi...James Dong2010-07-281-9/+15
|\ \ \ \ \ \
| * | | | | | Eliminate the linear cost associated with mSampleSizes.size()James Dong2010-07-281-9/+15
* | | | | | | Remove stale temporary ASEC containersKenny Root2010-07-281-2/+7
* | | | | | | Merge "Fix getTempContainerId()" into gingerbreadKenny Root2010-07-281-43/+25
|\ \ \ \ \ \ \
| * | | | | | | Fix getTempContainerId()Kenny Root2010-07-281-43/+25
* | | | | | | | am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyoScott Main2010-07-281-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge "fix markup error bug:2871538" into froyoScott Main2010-07-281-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | fix markup errorScott Main2010-07-281-2/+2
generated by cgit v1.1 at 2024-09-10 16:19:10 +0000