summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make sure the software mpeg4 decoder supports multiple input frames per input...Andreas Huber2011-05-242-8/+21
* resolved conflicts for merge of d5762583 to masterJames Dong2011-05-242-1/+7
|\
| * am ebae1923: am a5293d1c: Add some logging to track down where ANR happens du...James Dong2011-05-232-1/+7
| |\
| | * am a5293d1c: Add some logging to track down where ANR happens during MediaPla...James Dong2011-05-232-1/+7
| | |\
| | | * Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
* | | | am 46e802e9: (-s ours) am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 fro...Xavier Ducrohet2011-05-240-0/+0
|\ \ \ \ | |/ / /
| * | | am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not...Xavier Ducrohet2011-05-230-0/+0
| |\ \ \
| | * \ \ am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-233-32/+72
| | |\ \ \
| | | * | | Merge e57aa434 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-203-32/+72
* | | | | | am ea182704: (-s ours) am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b...Xavier Ducrohet2011-05-240-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1....Xavier Ducrohet2011-05-230-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gi...Xavier Ducrohet2011-05-233-22/+33
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbreadXavier Ducrohet2011-05-203-22/+33
| | | |\ \ \
| | | | * | | Merge 05b7b69c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-193-22/+33
* | | | | | | am 162dd490: (-s ours) am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae8...Xavier Ducrohet2011-05-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1....Xavier Ducrohet2011-05-230-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gi...Xavier Ducrohet2011-05-2311-51/+799
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbreadXavier Ducrohet2011-05-2011-51/+799
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge 2fae858d from Honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-1911-51/+799
* | | | | | | am 6056e326: am f96a6150: Data reconnection issue after airplane modeKazuhiro Ondo2011-05-241-25/+40
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f96a6150: Data reconnection issue after airplane modeKazuhiro Ondo2011-05-211-25/+40
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Data reconnection issue after airplane modeKazuhiro Ondo2011-05-211-25/+40
* | | | | | | am 8e1f6ece: am 4c88be65: GSM DCT: Update poll stats to support multi-linksKazuhiro Ondo2011-05-241-3/+23
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 4c88be65: GSM DCT: Update poll stats to support multi-linksKazuhiro Ondo2011-05-211-3/+23
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | GSM DCT: Update poll stats to support multi-linksKazuhiro Ondo2011-05-211-3/+23
* | | | | | | am 7abbf93c: am 15cd6ec2: Tear down connection with unwanted linkproperty changeWink Saville2011-05-243-25/+75
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 15cd6ec2: Tear down connection with unwanted linkproperty changeWink Saville2011-05-213-25/+75
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Tear down connection with unwanted linkproperty changeWink Saville2011-05-213-25/+75
* | | | | | | am f7bc0e28: am 16e8d22b: Fix build.Wink Saville2011-05-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 16e8d22b: Fix build.Wink Saville2011-05-201-4/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix build.Wink Saville2011-05-201-4/+0
* | | | | | | Fix build.Wink Saville2011-05-231-4/+0
* | | | | | | am f8d70b14: am 5f353de9: Merge "Notify RIL that PDP reset is triggered due t...Wink Saville2011-05-232-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall"...Wink Saville2011-05-202-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Notify RIL that PDP reset is triggered due to data stall" into honeyco...Wink Saville2011-05-202-0/+3
| | |\ \ \ \ \
| | | * | | | | Notify RIL that PDP reset is triggered due to data stallKazuhiro Ondo2011-05-202-0/+3
* | | | | | | | am b7a13791: am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTEJohn Wang2011-05-233-3/+105
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTEJohn Wang2011-05-203-3/+105
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add UI to handle SIM swap." into honeycomb-LTEJohn Wang2011-05-203-3/+105
| | |\ \ \ \ \ \
| | | * | | | | | Add UI to handle SIM swap.John Wang2011-05-203-3/+105
* | | | | | | | | am 59a3319f: am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp re...Jim Miller2011-05-2330-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target...Jim Miller2011-05-2030-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScre...Jim Miller2011-05-2030-0/+1
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI...Jim Miller2011-05-2030-0/+1
| | | |\ \ \ \ \
| | | | * | | | | Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUIJim Miller2011-05-2030-0/+1
* | | | | | | | | Merge "Add new imeFullscreenBackground for Theme.InputMethod.Holo"Tadashi G. Takaoka2011-05-237-23/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add new imeFullscreenBackground for Theme.InputMethod.HoloTadashi G. Takaoka2011-05-247-23/+2
* | | | | | | | | | Merge "Observe screen on/off events in NetworkPolicy."Jeff Sharkey2011-05-238-70/+272
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Observe screen on/off events in NetworkPolicy.Jeff Sharkey2011-05-238-70/+272
* | | | | | | | | | | Merge "fix x86 build"Mathias Agopian2011-05-2311-151/+161
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |