summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adding ASL2 attribution for VisualOn.Dan Morrill2011-01-131-0/+10
* Merge "New Intent defined for RF ON/OFF events" into gingerbreadNick Pelly2011-01-120-0/+0
|\
* \ Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbreadKenny Root2011-01-120-0/+0
|\ \
* \ \ Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbreadJaikumar Ganesh2011-01-120-0/+0
|\ \ \ | | |/ | |/|
* | | Merge "Fix issue 3302649." into gingerbreadEric Laurent2011-01-121-0/+3
|\ \ \
| * | | Fix issue 3302649.Eric Laurent2011-01-041-0/+3
* | | | Merge "Updated flightmode assets" into gingerbreadJustin Ho2011-01-120-0/+0
|\ \ \ \
* \ \ \ \ Merge "Allow updated system apps to retain priority" into gingerbreadKenny Root2011-01-120-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
* | | | | Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbreadAndreas Huber2011-01-110-0/+0
|/ / / /
* | | | Merge "Add auth. username in SipProfile." into gingerbreadChung-yih Wang2011-01-110-0/+0
|\ \ \ \
* \ \ \ \ Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does n...James Dong2011-01-100-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into ginger...Nick Pelly2011-01-100-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(...Nick Pelly2011-01-100-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
* | | | | | Merge "Referencing of "r.record.name" is occured, when "r.record" is null." i...Dianne Hackborn2011-01-090-0/+0
* | | | | | Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." int...Dianne Hackborn2011-01-090-0/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge "Fix the test application orientation. Bug# 3205196" into gingerbreadYu Shan Emily Lau2011-01-070-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbreadGilles Debunne2011-01-060-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge "Asset cleanup. DO NOT MERGE" into gingerbreadGilles Debunne2011-01-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
* | | | | | Merge "Import translations for additional languages." into gingerbreadEric Fischer2011-01-060-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge "Make the new NFC APIs public." into gingerbreadJeff Hamilton2011-01-060-0/+0
* | | | | | Merge "Avoiding cyclic references when unbinding from a service" into gingerb...Dianne Hackborn2011-01-050-0/+0
|\ \ \ \ \ \ | |/ / / / /
* | | | | | Merge "Suppress the recording sound in the recorded video" into gingerbreadJames Dong2011-01-050-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into ging...Nick Pelly2011-01-040-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | Merge "Fix setting audio group mode in SipPhone." into gingerbreadHung-ying Tyan2011-01-040-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge "Added response flags and DSFID extras for NfcV technology (API part)."...Nick Pelly2011-01-030-0/+0
|\ \ \ \ \ \ | |/ / / / /
* | | | | | Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into ging...Nick Pelly2011-01-030-0/+0
|\ \ \ \ \ \ | |/ / / / /
* | | | | | Merge "Added getType() to NDEF technology class (API part)." into gingerbreadNick Pelly2011-01-030-0/+0
|\ \ \ \ \ \ | |/ / / / /
* | | | | | Merge "Removed selectAid() from IsoDep." into gingerbreadNick Pelly2011-01-030-0/+0
|\ \ \ \ \ \ | |/ / / / /
* | | | | | Merge "Added transfer/restore convience cmds to MF Classic tech." into ginger...Nick Pelly2011-01-030-0/+0
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
* | | | | Merge "Clear request list while timeout." into gingerbreadJohn Wang2011-01-030-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
* | | | | Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff o...Alon Albert2010-12-280-0/+0
|\ \ \ \ \ | |/ / / / |/| | | |
* | | | | Merge "frameworks/base: Fix to release references in ActivityManagerService" ...Dianne Hackborn2010-12-230-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbreadJeff Brown2010-12-231-1/+15
|\ \ \ \ \
| * | | | | Fix policy issues when screen is off. (DO NOT MERGE)Jeff Brown2010-12-221-1/+15
* | | | | | Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." ...Dianne Hackborn2010-12-220-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
* | | | | Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do n...James Dong2010-12-220-0/+0
|/ / / /
* | | | Merge "Check if VoIP API is supported in SipManager." into gingerbreadHung-ying Tyan2010-12-210-0/+0
|\ \ \ \
* \ \ \ \ Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbreadRobert Greenwalt2010-12-210-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
* | | | | Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into ging...Dianne Hackborn2010-12-210-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
* | | | | Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbreadSimon Wilson2010-12-200-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
* | | | | Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but w...Mike LeBeau2010-12-200-0/+0
| |_|/ / |/| | |
* | | | disable the bypass mode. DO NOT MERGE.Mathias Agopian2010-12-181-1/+0
* | | | Merge "Fix issue #3289835: NullPointerException in..." into gingerbreadDianne Hackborn2010-12-170-0/+0
|\ \ \ \ | | |/ / | |/| |
* | | | Merge "Check port in create peer's SIP profile." into gingerbreadHung-ying Tyan2010-12-160-0/+0
|\ \ \ \
* \ \ \ \ Merge "Need to check ndef before writing ndef." into gingerbreadNick Pelly2010-12-160-0/+0
|\ \ \ \ \ | |/ / / /
* | | | | Merge "Fix issue 2712130: Sholes: problem when playing audio while recording ...Eric Laurent2010-12-160-0/+0
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
* | | | Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: ...Scott Main2010-12-150-0/+0
|/ / /
* | | Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activi...Dianne Hackborn2010-12-150-0/+0
|/ /
* | Merge "Work on issue #3255640: Need to bump GB to API 10 version name "2.4"" ...Dianne Hackborn2010-12-140-0/+0
|\ \
* \ \ Merge "GL texture filtering changed from AND to OR, so rename tag name to mat...Dan Morrill2010-12-140-0/+0
|\ \ \ | |/ / |/| |