summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Optimize FBO drawing with regions. This optimization is currently disa...Romain Guy2010-11-021-1/+1
|\
| * Optimize FBO drawing with regions.Romain Guy2010-11-021-1/+1
* | Merge "Use AsynChannel for synchronous API"Irfan Sheriff2010-11-020-0/+0
|\ \
* \ \ Merge "Disable some logs"Gloria Wang2010-11-020-0/+0
|\ \ \
* \ \ \ Merge "Use Holo theme for Ringtone picker."Amith Yamasani2010-11-020-0/+0
|\ \ \ \
* \ \ \ \ Merge "New RS types test for checking compilation."Stephen Hines2010-11-020-0/+0
|\ \ \ \ \
* | | | | | Merge "Fix bug 2248975, edits to load error HTML pages."Roy West2010-11-020-0/+0
| |/ / / / |/| | | |
* | | | | Merge "Fix default return code for getResource"Kenny Root2010-11-021-1/+1
|\ \ \ \ \
| * | | | | Fix default return code for getResourceKenny Root2010-11-021-1/+1
* | | | | | Merge "deperecate Cursor requery() and sa, Loader should be used instead"Vasu Nori2010-11-020-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge "Put back the back button"Joe Onorato2010-11-020-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge "Made paste window nicer: asset and padding"Gilles Debunne2010-11-020-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Update the subtype icon properly."satok2010-11-020-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | am 7ab5d2d9: am a87ea46c: Fix bugs related to cheek event suppression.Jeff Brown2010-11-021-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | am a87ea46c: Fix bugs related to cheek event suppression.Jeff Brown2010-11-011-3/+3
| |\ \ \ \ \ \
| | * | | | | | Fix bugs related to cheek event suppression.Jeff Brown2010-11-011-3/+3
* | | | | | | | Merge "Added missing label and char limits"Daniel Lehmann2010-11-010-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
* | | | | | | | am 424963ef: am 5dda76a7: Adding some StorageManager integration test infrast...Neal Nguyen2010-11-010-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 5dda76a7: Adding some StorageManager integration test infrastructure and s...Neal Nguyen2010-11-010-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge "Fix a bug that enabled Subtype ID can't be saved propery."satok2010-11-010-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ am af35b8f4: am bd06f02d: Cleaning up some more flakiness in DownloadManager ...Neal Nguyen2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am bd06f02d: Cleaning up some more flakiness in DownloadManager tests.Neal Nguyen2010-11-010-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge "Stop using OMX_COLOR_FormatAndroidPrivateStart."Jamie Gennis2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "Update layers only"Nicolas Roard2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge "Fixed null deref when view parent null during invalidation"Chet Haase2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | am ea8400b4: (-s ours) am a7fda21c: DO NOT MERGE: Doc Change: Documentation f...Joe Malin2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner toolJoe Malin2010-11-010-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge "Notify surfaceflinger about (changes to) the crop rectangle output by ...Andreas Huber2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "MTP: Changes to support /mnt/sdcard paths from MediaProvider."Mike Lockwood2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Layoutlib Canvas and Paint implementation through native delegates"Xavier Ducrohet2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge "Fix race condition in resize that was created when GetType for allocat...Jason Sams2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ am ab1b304b: am ccb75a88: Merge "Update the API file." into gingerbreadDan Bornstein2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am ccb75a88: Merge "Update the API file." into gingerbreadDan Bornstein2010-11-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Update the API file." into gingerbreadDan Bornstein2010-11-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ Merge "Doc Change: Documentation for MonkeyRunner tool"Joe Malin2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ am e06bdead: am fea07c60: am eda78cea: docs: update dashboardScott Main2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am fea07c60: am eda78cea: docs: update dashboardScott Main2010-11-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am eda78cea: docs: update dashboardScott Main2010-11-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge "Media scanner support for FL(Forward Lock) DRM file types"Gloria Wang2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Don't crash bmgr if there are no available restore sets"Chris Tate2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Merge commit '55381217' into manualmerge"Leon Scroggins2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '55381217' into manualmergeLeon Scroggins2010-11-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbreadLeon Scroggins2010-11-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "Update insertion handler for WebTextView." into gingerbreadLeon Scroggins2010-11-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Fix policy issues when screen is off."Jeff Brown2010-11-011-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix policy issues when screen is off.Jeff Brown2010-11-011-1/+15
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Add code to mark functions rather than whole files as threadable."Jason Sams2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Disconnect PAN and Input devices on BT disable."Jaikumar Ganesh2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix a find and replace bug in Theme.IconMenu"Adam Powell2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | / / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Various PreferenceActivity and related improvement."Dianne Hackborn2010-11-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |