summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into ging...Nick Pelly2011-01-042-10/+24
|\
| * Fix technology extra naming for IsoDep and NfcB (API part).Martijn Coenen2011-01-052-10/+24
* | Merge "Fix setting audio group mode in SipPhone." into gingerbreadHung-ying Tyan2011-01-041-21/+50
|\ \
| * | Fix setting audio group mode in SipPhone.Hung-ying Tyan2010-12-291-21/+50
* | | RTP: Send silence packets on idle streams for every second.Chia-chi Yeh2011-01-041-32/+48
| |/ |/|
* | Merge "Added response flags and DSFID extras for NfcV technology (API part)."...Nick Pelly2011-01-032-0/+20
|\ \
| * | Added response flags and DSFID extras for NfcV technology (API part).Martijn Coenen2011-01-042-0/+20
* | | Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into ging...Nick Pelly2011-01-031-7/+20
|\ \ \ | |/ /
| * | Tweak Ndef.getType() API. Rename constants, expand javadoc.Nick Pelly2011-01-041-7/+20
* | | Merge "Added getType() to NDEF technology class (API part)." into gingerbreadNick Pelly2011-01-031-0/+19
|\ \ \ | |/ /
| * | Added getType() to NDEF technology class (API part).Martijn Coenen2011-01-041-0/+19
* | | Merge "Removed selectAid() from IsoDep." into gingerbreadNick Pelly2011-01-031-15/+0
|\ \ \ | |/ /
| * | Removed selectAid() from IsoDep.Martijn Coenen2011-01-041-15/+0
| |/
* | Merge "Added transfer/restore convience cmds to MF Classic tech." into ginger...Nick Pelly2011-01-031-2/+29
|\ \
| * | Added transfer/restore convience cmds to MF Classic tech.Martijn Coenen2011-01-041-2/+29
| |/
* | Merge "Clear request list while timeout." into gingerbreadJohn Wang2011-01-031-24/+47
|\ \ | |/ |/|
| * Clear request list while timeout.John Wang2010-12-281-24/+47
* | Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff o...Alon Albert2010-12-282-27/+131
|\ \ | |/ |/|
| * Improved ignore-backoff handlingAlon Albert2010-12-222-27/+131
* | Merge "frameworks/base: Fix to release references in ActivityManagerService" ...Dianne Hackborn2010-12-231-0/+8
|\ \
| * | frameworks/base: Fix to release references in ActivityManagerServiceVairavan Srinivasan2010-12-231-0/+8
* | | Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbreadJeff Brown2010-12-238-257/+256
|\ \ \
| * | | Fix policy issues when screen is off. (DO NOT MERGE)Jeff Brown2010-12-228-257/+256
* | | | Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." ...Dianne Hackborn2010-12-221-2/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Another stab at fixing issue #3149290 java.lang.RuntimeException:...Dianne Hackborn2010-12-221-2/+10
| |/ /
* | | Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do n...James Dong2010-12-222-6/+51
|\ \ \
| * | | Expose AMRNB/WB and AAC encoder and related file output formats - do not mergeJames Dong2010-12-222-6/+51
| |/ /
* | | Improve performance of WindowState.toString()Mattias Petersson2010-12-221-3/+13
|/ /
* | Remove canBeFormatted().Jeff Hamilton2010-12-222-10/+1
* | Merge "Check if VoIP API is supported in SipManager." into gingerbreadHung-ying Tyan2010-12-212-5/+31
|\ \
| * | Check if VoIP API is supported in SipManager.Hung-ying Tyan2010-12-212-5/+31
* | | Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbreadRobert Greenwalt2010-12-211-0/+1
|\ \ \
| * | | Be sure and report NO_CONNECTIVITY when needed.Robert Greenwalt2010-12-211-0/+1
* | | | Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into ging...Dianne Hackborn2010-12-212-3/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix issue #3224616: TimeUtils.formatDuration() can drop 0s.Bjorn Bringert2010-12-202-3/+20
* | | | Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbreadSimon Wilson2010-12-203-1/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | fix [3127755] Launcher is missing anti-aliasingMathias Agopian2010-12-153-1/+8
* | | | Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but w...Mike LeBeau2010-12-202-17/+89
|\ \ \ \
| * | | | Unhide RecognizerResultsIntent. This API wasMike LeBeau2010-12-202-17/+89
| | |_|/ | |/| |
* | | | cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954Scott Main2010-12-201-4/+3
|/ / /
* | | disable the bypass mode. DO NOT MERGE.Mathias Agopian2010-12-181-1/+0
* | | Clean up and polish Mifare Classic tech.Martijn Coenen2010-12-171-17/+74
* | | Merge "Fix issue #3289835: NullPointerException in..." into gingerbreadDianne Hackborn2010-12-171-1/+4
|\ \ \
| * | | Fix issue #3289835: NullPointerException in...Dianne Hackborn2010-12-161-1/+4
| | |/ | |/|
* | | Remove SIP realm/domain checkHung-ying Tyan2010-12-171-6/+8
* | | Merge "Check port in create peer's SIP profile." into gingerbreadHung-ying Tyan2010-12-162-5/+7
|\ \ \
| * | | Check port in create peer's SIP profile.Hung-ying Tyan2010-12-162-5/+7
* | | | Merge "Need to check ndef before writing ndef." into gingerbreadNick Pelly2010-12-161-11/+17
|\ \ \ \
| * | | | Need to check ndef before writing ndef.Martijn Coenen2010-12-161-11/+17
| |/ / /
* | | | cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308cScott Main2010-12-161-7/+7