summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge "Fix bug in permission grant system." into gingerbreadCostin Manolache2010-12-140-0/+0
|\ \ \ | |_|/ |/| |
* | | Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon te...Roman Nurik2010-12-130-0/+0
|\ \ \
* \ \ \ Merge "Fix StrictMode javadoc copy/paste error." into gingerbreadBrad Fitzpatrick2010-12-130-0/+0
|\ \ \ \ | | |_|/ | |/| |
* | | | Merge "Avoid leaking sockets." into gingerbreadNick Kralevich2010-12-130-0/+0
|/ / /
* | | Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbreadNick Pelly2010-12-100-0/+0
|\ \ \ | | |/ | |/|
* | | Merge "Integrating webinar hosting with developer.android.com" into gingerbreadMegha Joshi2010-12-100-0/+0
|\ \ \ | |/ / |/| / | |/
* | reconcile with open-source gingerbreadJean-Baptiste Queru2010-12-090-0/+0
|\ \
* \ \ Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on G...Mathias Agopian2010-12-081-2/+2
|\ \ \
| * | | fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/CrespoMathias Agopian2010-12-081-2/+2
* | | | Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initia...James Dong2010-12-080-0/+0
|\ \ \ \
* \ \ \ \ Merge "[317580] fix issue where the screen wouldn't be rotated properly in by...Mathias Agopian2010-12-083-1/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [317580] fix issue where the screen wouldn't be rotated properly in bypass modeMathias Agopian2010-12-073-1/+19
| |/ / /
* | | | Merge "Implemented getSize() to return max ndef size." into gingerbreadNick Pelly2010-12-070-0/+0
* | | | Merge "Add more checks for bad values to protect from corrupt files." into gi...Dianne Hackborn2010-12-070-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
* | | Merge changes Ie03796ae,Ide3e980a into gingerbreadMathias Agopian2010-12-0711-19/+201
|\ \ \
| * | | [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)Mathias Agopian2010-12-038-11/+172
| * | | [3171580] Add transform field to native buffers. (DO NOT MERGE)Mathias Agopian2010-12-033-8/+29
* | | | Merge changes I244b5469,I32044e91 into gingerbreadMathias Agopian2010-12-074-21/+19
|\ \ \ \ | |/ / /
| * | | [3171580] Fix two typos related to fixed-size buffersMathias Agopian2010-12-034-21/+19
* | | | Merge "[3171580] don't automatically log GraphicBuffer allocation failures" i...Mathias Agopian2010-12-075-5/+18
|\ \ \ \ | |/ / /
| * | | [3171580] don't automatically log GraphicBuffer allocation failuresMathias Agopian2010-12-035-5/+18
* | | | Merge "Remove Type X Tags from the top-level API." into gingerbreadJeff Hamilton2010-12-070-0/+0
|\ \ \ \
* \ \ \ \ Merge "More precise status bar battery icons." into gingerbreadDaniel Sandler2010-12-070-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
* | | | | Merge "Corrected MIFARE default key set" into gingerbreadNick Pelly2010-12-070-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge "Fix SIP bug of different transport/port used for requests." into ginge...Chung-yih Wang2010-12-060-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge "Added NdefFormatable tag, initial class with supported methods." into ...Nick Pelly2010-12-060-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" in...Mathias Agopian2010-12-061-8/+25
|\ \ \ \ \ \
| * | | | | | [3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGLMathias Agopian2010-12-031-8/+25
* | | | | | | Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into ging...Nick Pelly2010-12-060-0/+0
| |/ / / / / |/| | | | |
* | | | | | Merge gingerbread-nfc into gingerbreadNick Pelly2010-12-050-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'ohd/gingerbread' into mergeJeff Hamilton2010-12-022-42/+42
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbreadNick Pelly2010-12-050-0/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch gingerbread-nfc into gingerbread.Nick Pelly2010-12-050-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbreadIrfan Sheriff2010-12-030-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge "Set AudioGroup mode according to audio settings" into gingerbreadHung-ying Tyan2010-12-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerb...Xia Wang2010-12-020-0/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "Be conservative in estimating the file size limit." into gingerbreadJames Dong2010-12-020-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." i...Eric Laurent2010-12-010-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbreadKenny Root2010-12-010-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
* | | | | | | | am a45d6937: docs: dashboard updateScott Main2010-12-010-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "Fix issue 3142808." into gingerbreadEric Laurent2010-12-010-0/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbreadIrfan Sheriff2010-12-010-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver"...Irfan Sheriff2010-12-010-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." int...Brad Fitzpatrick2010-12-010-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "Do not suppress error feedback during a SIP call." into gingerbreadHung-ying Tyan2010-11-300-0/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "allow rotation-vector to have 4 components" into gingerbreadMathias Agopian2010-11-300-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into...David Brown2010-11-300-0/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into ginge...Andreas Huber2010-11-300-0/+0
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge "Uses 4-th order low-pass for extracting gravity." into gingerbreadMathias Agopian2010-11-300-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube w...Andreas Huber2010-11-300-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |