summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix screen on/off animation (again)Mathias Agopian2011-07-082-13/+42
* Fix EGLUtils::selectConfigForPixelFormat()Mathias Agopian2011-07-082-25/+78
* Merge "Use advertised h264 encoding parameters by default if the profile is n...James Dong2011-07-080-0/+0
|\
* \ Merge "Fix build warning; LOG_TAG was misplaced"Glenn Kasten2011-07-080-0/+0
|\ \
* \ \ Merge "Pseudo-final api fixes to CalendarContract"RoboErik2011-07-080-0/+0
|\ \ \
* \ \ \ Merge "Fix 4689527: Improved curation for Recents + misc cleanup"Jim Miller2011-07-080-0/+0
|\ \ \ \ | |/ / /
* | | | Merge "Can now restore a subset of apps from historical dataset"Christopher Tate2011-07-080-0/+0
|\ \ \ \
* \ \ \ \ Merge "NPE guard in setupViewport"John Reck2011-07-080-0/+0
|\ \ \ \ \
* \ \ \ \ \ am a736cd54: am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER...Wink Saville2011-07-080-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 500...Wink Saville2011-07-080-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into hon...Wink Saville2011-07-070-0/+0
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge "Correctly position layers."Romain Guy2011-07-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "Merge Chromium at r12.0.742.93: New autofill string"Kristian Monsen2011-07-080-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge "Remove unused setHttpProxy."Robert Greenwalt2011-07-080-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge "Cleanup"Romain Guy2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Use NEAREST filtering mode for TextureView.getBitmap()."Romain Guy2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
* | | | | | | | | | Merge "Add ALL CAPS style to TextView/TextAppearance"Adam Powell2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Use NEAREST filtering for layers whenever possible."Romain Guy2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge "Handling Resources.NotFoundException in Recents"Michael Jurka2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge "Fix more type info caching bugs."Jason Sams2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge "Update viewport asap."Shimeng (Simon) Wang2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix defered type creation when loading from A3D."Jason Sams2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "XmlDocumentProvider moved to the XmlAdapter sample code"Gilles Debunne2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "AllocationAdapter cleanup."Jason Sams2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Moved and renamed effect API header files"Eric Laurent2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Revert "docs: OpenGL Tutorials""Joe Fernandez2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Revert "b/3302378 Passes touch pressures, size and timestamps to webki...Huahui Wu2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "SurfaceTexture: enable newly passing tests."Jamie Gennis2011-07-071-8/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | SurfaceTexture: enable newly passing tests.Jamie Gennis2011-07-061-8/+4
* | | | | | | | | | | | | | | Merge "Action bar layout tweaks"Adam Powell2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix 4689527: Fix rendering issue with thumbnails on phones"Jim Miller2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: OpenGL Tutorials"Joe Fernandez2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Simplify and tidy the API for maximum value support."Philip Milne2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Add an API to query maximum bitmap/texture size on Canvas."Romain Guy2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Fix 4689527: Update Recents"Jim Miller2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Contacts contract changes for social updates."Daniel Lehmann2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add support for some custom YUV420 color formats to recordvideo utility"James Dong2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 33f6d634: am e4e1c3fd: am 40afb97c: cherrypick Change-Id: I51ac719e414ac27...Scott Main2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am e4e1c3fd: am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb...Scott Main2011-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 ...Scott Main2011-07-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9638fbcf: am 0657e1a7: am 77dfe217: cherrypick Change-Id: I2f4c79c5874835b...Scott Main2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 0657e1a7: am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff...Scott Main2011-07-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am 77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb ...Scott Main2011-07-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am 19065008: am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on dat...Wink Saville2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup trigg...Wink Saville2011-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into hon...Wink Saville2011-07-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6c9d636f: am 027654e9: am ad2724de: cherrypicking from hc-mr1 Change-Id: I...Robert Ly2011-07-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 027654e9: am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94...Robert Ly2011-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195...Robert Ly2011-07-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / /