- b1f1d0e Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread by James Dong · 15 years ago
- 824bb88 Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread by Jaikumar Ganesh · 15 years ago
- 6d3c5ae Merge "Added check to make orientation calculations more robust" into gingerbread by Dianne Hackborn · 15 years ago
- 12edc15 Merge "Make the Phone options dialog use current language" into gingerbread by Dianne Hackborn · 15 years ago
- e6ec661 Merge "Add date format and map center resources for new locales." into gingerbread by Eric Fischer · 15 years ago
- 4877837 Merge "Do not merge." into gingerbread by Wei-Ta Chen · 15 years ago
- 960f8a6 Adding ASL2 attribution for VisualOn. by Dan Morrill · 15 years ago
- 2ee9a92 Merge "New Intent defined for RF ON/OFF events" into gingerbread by Nick Pelly · 15 years ago
- 9c9f15a Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread by Kenny Root · 15 years ago
- d4960f4 Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread by Jaikumar Ganesh · 15 years ago
- 9e41414 Merge "Fix issue 3302649." into gingerbread by Eric Laurent · 15 years ago
- a7498c9 Merge "Updated flightmode assets" into gingerbread by Justin Ho · 15 years ago
- c31a450 Merge "Allow updated system apps to retain priority" into gingerbread by Kenny Root · 15 years ago
- e9bef14 Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread by Andreas Huber · 15 years ago
- 63f338d Merge "Add auth. username in SipProfile." into gingerbread by Chung-yih Wang · 15 years ago
- e599801 Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread by James Dong · 15 years ago
- 19fded7 Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into gingerbread by Nick Pelly · 15 years ago
- e793425 Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread by Nick Pelly · 15 years ago
- b318ca6 Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread by Dianne Hackborn · 15 years ago
- 3948d71 Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread by Dianne Hackborn · 15 years ago
- 6d15b27 Merge "Fix the test application orientation. Bug# 3205196" into gingerbread by Yu Shan Emily Lau · 15 years ago
- 2029a91 Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread by Gilles Debunne · 15 years ago
- 00a99a9 Merge "Asset cleanup. DO NOT MERGE" into gingerbread by Gilles Debunne · 15 years ago
- 8f55bbb Merge "Import translations for additional languages." into gingerbread by Eric Fischer · 15 years ago
- 5a2804d Merge "Make the new NFC APIs public." into gingerbread by Jeff Hamilton · 15 years ago
- c0cb771 Merge "Avoiding cyclic references when unbinding from a service" into gingerbread by Dianne Hackborn · 15 years ago
- da57245 Merge "Suppress the recording sound in the recorded video" into gingerbread by James Dong · 15 years ago
- 83f1f8c Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread by Nick Pelly · 15 years ago
- 675b5b0 Merge "Fix setting audio group mode in SipPhone." into gingerbread by Hung-ying Tyan · 15 years ago
- a017d5b Fix issue 3302649. by Eric Laurent · 15 years ago
- 84680db Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread by Nick Pelly · 15 years ago
- ddf6027 Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread by Nick Pelly · 15 years ago
- 610d72d Merge "Added getType() to NDEF technology class (API part)." into gingerbread by Nick Pelly · 15 years ago
- 5c5258a Merge "Removed selectAid() from IsoDep." into gingerbread by Nick Pelly · 15 years ago
- af84317 Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread by Nick Pelly · 15 years ago
- d9883db Merge "Clear request list while timeout." into gingerbread by John Wang · 15 years ago
- d3b9dc7 Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread by Alon Albert · 15 years ago
- 0e6375a Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread by Dianne Hackborn · 15 years ago
- 37cc46a Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread by Jeff Brown · 15 years ago
- 947d92c Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread by Dianne Hackborn · 15 years ago
- e7a0d2b Fix policy issues when screen is off. (DO NOT MERGE) by Jeff Brown · 15 years ago
- 7bc0c0a Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread by James Dong · 15 years ago
- 6777b7f Merge "Check if VoIP API is supported in SipManager." into gingerbread by Hung-ying Tyan · 15 years ago
- 374504c Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread by Robert Greenwalt · 15 years ago
- 0c65686 Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread by Dianne Hackborn · 15 years ago
- c6a0991 Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread by Simon Wilson · 15 years ago
- 98cb0d3 Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread by Mike LeBeau · 15 years ago
- 902329f disable the bypass mode. DO NOT MERGE. by Mathias Agopian · 15 years ago
- 8088064 Merge "Fix issue #3289835: NullPointerException in..." into gingerbread by Dianne Hackborn · 15 years ago
- dce71fb Merge "Check port in create peer's SIP profile." into gingerbread by Hung-ying Tyan · 15 years ago
- bb55eef Merge "Need to check ndef before writing ndef." into gingerbread by Nick Pelly · 15 years ago
- b6272d1 Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread by Eric Laurent · 15 years ago
- 1d7e1b3 Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread by Scott Main · 15 years ago
- a43aa9c Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread by Dianne Hackborn · 15 years ago
- a203783 Merge "Work on issue #3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread by Dianne Hackborn · 15 years ago
- 78bcc60 Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread by Dan Morrill · 15 years ago
- eaefb93 Merge "Fix bug in permission grant system." into gingerbread by Costin Manolache · 15 years ago
- 992b150 Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread by Roman Nurik · 15 years ago
- 7ed1f65 Merge "Fix StrictMode javadoc copy/paste error." into gingerbread by Brad Fitzpatrick · 15 years ago
- 7fcd6df Merge "Avoid leaking sockets." into gingerbread by Nick Kralevich · 15 years ago
- 3cb8da4 Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread by Nick Pelly · 15 years ago
- ebce77e Merge "Integrating webinar hosting with developer.android.com" into gingerbread by Megha Joshi · 15 years ago
- c288fb7 reconcile with open-source gingerbread by Jean-Baptiste Queru · 15 years ago
- 9215cab Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread by Mathias Agopian · 15 years ago
- a8e4eb7 Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread by James Dong · 15 years ago
- c3ce880 fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo by Mathias Agopian · 15 years ago
- fc84e82 Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread by Mathias Agopian · 15 years ago
- ce561fa Merge "Implemented getSize() to return max ndef size." into gingerbread by Nick Pelly · 15 years ago
- 84d86eb Merge "Add more checks for bad values to protect from corrupt files." into gingerbread by Dianne Hackborn · 15 years ago
- e24cc7a [317580] fix issue where the screen wouldn't be rotated properly in bypass mode by Mathias Agopian · 15 years ago
- db13e36 Merge changes Ie03796ae,Ide3e980a into gingerbread by Mathias Agopian · 15 years ago
- c24928f Merge changes I244b5469,I32044e91 into gingerbread by Mathias Agopian · 15 years ago
- abf06a7 Merge "[3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread by Mathias Agopian · 15 years ago
- 3846f7a Merge "Remove Type X Tags from the top-level API." into gingerbread by Jeff Hamilton · 15 years ago
- 6f14ecd Merge "More precise status bar battery icons." into gingerbread by Daniel Sandler · 15 years ago
- 95e4f1e Merge "Corrected MIFARE default key set" into gingerbread by Nick Pelly · 15 years ago
- 823f079 Merge "Fix SIP bug of different transport/port used for requests." into gingerbread by Chung-yih Wang · 15 years ago
- 7592f8f Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread by Nick Pelly · 15 years ago
- f219856 Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread by Mathias Agopian · 15 years ago
- 2361dd2 Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread by Nick Pelly · 15 years ago
- 4995b0c Merge gingerbread-nfc into gingerbread by Nick Pelly · 15 years ago
- 54c9d4a Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread by Nick Pelly · 15 years ago
- 130f48f Merge branch gingerbread-nfc into gingerbread. by Nick Pelly · 15 years ago
- 10484ac Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread by Irfan Sheriff · 15 years ago
- 22c6784 [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE) by Mathias Agopian · 15 years ago
- 30eb1b1 [3171580] Add transform field to native buffers. (DO NOT MERGE) by Mathias Agopian · 15 years ago
- 733189d [3171580] Fix two typos related to fixed-size buffers by Mathias Agopian · 15 years ago
- 678bdd6 [3171580] don't automatically log GraphicBuffer allocation failures by Mathias Agopian · 15 years ago
- 644bb2a [3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL by Mathias Agopian · 15 years ago
- 33f4f32 Merge "Set AudioGroup mode according to audio settings" into gingerbread by Hung-ying Tyan · 15 years ago
- 147abbd Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread by Xia Wang · 15 years ago
- 11cdf95 Merge "Be conservative in estimating the file size limit." into gingerbread by James Dong · 15 years ago
- 1c79a55 Merge remote branch 'ohd/gingerbread' into merge by Jeff Hamilton · 15 years ago
- 8217671 Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread by Eric Laurent · 15 years ago
- 8e41fd2 Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread by Kenny Root · 15 years ago
- 1e0f732 am a45d6937: docs: dashboard update by Scott Main · 15 years ago
- 4db2fd9 Merge "Fix issue 3142808." into gingerbread by Eric Laurent · 15 years ago
- a29e6d9 Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread by Irfan Sheriff · 15 years ago
- d4d5dab Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread by Irfan Sheriff · 15 years ago
- e5f05b8 Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread by Brad Fitzpatrick · 15 years ago