summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)Adam Powell2011-11-175-6/+2
* Merge "IME action (done, next...) correctly handled" into ics-mr1Gilles Debunne2011-11-161-1/+3
|\
| * IME action (done, next...) correctly handledGilles Debunne2011-11-161-1/+3
* | Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers...Alex Sakhartchouk2011-11-161-10/+16
|\ \
| * | Followup to a bug fix.Alex Sakhartchouk2011-11-151-10/+16
* | | Merge "Bluetooth HDP sample." into ics-mr1Fred Chung2011-11-162-0/+10
|\ \ \
| * | | Bluetooth HDP sample.Fred Chung2011-11-142-0/+10
* | | | No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
|\ \ \ \
| * \ \ \ Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \
| | \ \ \ \
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fix bug in TextLayoutCacheKey handling embedded nulls.Jeff Brown2011-11-111-1/+1
| * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-150-0/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-140-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-130-0/+0
| | | |\ \ \ \ \
| | | | * | | | | DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open anAdam Powell2011-11-112-2/+7
| | | | * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-110-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-100-0/+0
| | | | | |\ \ \ \ \
* | | | | | \ \ \ \ \ am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tab...Jake Hamby2011-11-153-11/+52
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ic...Jake Hamby2011-11-153-11/+52
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix 3GPP SMS send failure for 7-bit national language tables.Jake Hamby2011-11-143-11/+52
| | |/ / / / / / / / /
* | | | | | | | | | | am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0Bill Gruber2011-11-151-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0Bill Gruber2011-11-151-5/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | IAB Doc Fix: Error in code snippetBill Gruber2011-11-151-5/+5
| | |/ / / / / / / / /
* | | | | | | | | | | am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." i...Adrian Ludwig2011-11-152-0/+776
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0Adrian Ludwig2011-11-152-0/+776
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Adding new "Security Best Practices" to the html docs.Adrian Ludwig2011-11-082-0/+776
* | | | | | | | | | | Merge "Document that release() should be called with onPause() and onStop() f...James Dong2011-11-152-9/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Document that release() should be called with onPause() and onStop() for medi...James Dong2011-11-152-9/+28
* | | | | | | | | | | | Merge "Fix bug 5623642 - Status bar background incompatible with some legacy ...Adam Powell2011-11-154-2/+76
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix bug 5623642 - Status bar background incompatible with some legacy appsAdam Powell2011-11-154-2/+76
* | | | | | | | | | | | | Merge "Eliminate hw.keyboards system properties." into ics-mr1Jeff Brown2011-11-1513-104/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Eliminate hw.keyboards system properties.Jeff Brown2011-11-1513-104/+67
* | | | | | | | | | | | | | Merge "Whoops, need to acquire lock." into ics-mr1Dianne Hackborn2011-11-152-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Whoops, need to acquire lock.Dianne Hackborn2011-11-152-8/+11
* | | | | | | | | | | | | | | Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1Jean-Michel Trivi2011-11-151-14/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix 5623252 unlink to death of audio focus client earlyJean-Michel Trivi2011-11-151-14/+18
* | | | | | | | | | | | | | | | Merge "rework a bit how we manage EGL extensions" into ics-mr1Mathias Agopian2011-11-1517-4165/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rework a bit how we manage EGL extensionsMathias Agopian2011-11-1417-4165/+82
* | | | | | | | | | | | | | | | | Fix 5581164: Add abbreviated localized date stringsJim Miller2011-11-1563-0/+63
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1Jim Miller2011-11-152-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix 5581164: Use abbreviated day in lockscreenJim Miller2011-11-142-1/+2
* | | | | | | | | | | | | | | | | am d5897dc7: fix for build breakage.Tsu Chiang Chuang2011-11-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | / / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix for build breakage.Tsu Chiang Chuang2011-11-141-2/+2
* | | | | | | | | | | | | | | | Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into...Jim Miller2011-11-151-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix 5602985: Show "Emergency calls only" when device has no SIM.Jim Miller2011-11-141-0/+7
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Override app requested orientation when docked." into ics-mr1Jeff Brown2011-11-151-10/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Override app requested orientation when docked.Jeff Brown2011-11-151-10/+21
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Improve low memory dropbox reporting." into ics-mr1Dianne Hackborn2011-11-153-52/+149
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Improve low memory dropbox reporting.Dianne Hackborn2011-11-153-52/+149
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1Mathias Agopian2011-11-152-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \