summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix IP address cleanup on network disconnectIrfan Sheriff2011-06-173-9/+27
* Merge "DownloadManager flags for network policy."Jeff Sharkey2011-06-166-5/+55
|\
| * DownloadManager flags for network policy.Jeff Sharkey2011-06-166-5/+55
* | Merge "Inline SeekBarPreference"John Reck2011-06-166-46/+404
|\ \
| * | Inline SeekBarPreferenceJohn Reck2011-06-166-46/+404
* | | am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the net...Robert Greenwalt2011-06-163-52/+40
|\ \ \
| * \ \ am 5f350512: Merge "Reset connections AFTER we take down the network." into h...Robert Greenwalt2011-06-163-52/+40
| |\ \ \
| | * \ \ Merge "Reset connections AFTER we take down the network." into honeycomb-LTERobert Greenwalt2011-06-163-52/+40
| | |\ \ \
| | | * | | Reset connections AFTER we take down the network.Robert Greenwalt2011-06-163-52/+40
* | | | | | am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." int...John Wang2011-06-1610-16/+118
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTEJohn Wang2011-06-1610-16/+118
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Support SIM permanently disabled state." into honeycomb-LTEJohn Wang2011-06-1610-16/+118
| | |\ \ \ \
| | | * | | | Support SIM permanently disabled state.John Wang2011-06-1410-16/+118
* | | | | | | am 35e6d686: (-s ours) am 0887b8c2: am 8e18668d: revert surfaceflinger leak f...Mathias Agopian2011-06-160-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a cr...Mathias Agopian2011-06-156-90/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom...Mathias Agopian2011-06-156-90/+10
| | |\ \ \ \ \
| | | * | | | | revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)Mathias Agopian2011-06-156-90/+10
* | | | | | | | am 552bd670: (-s ours) am d5244e0a: am 52a43990: Revert "revert surfaceflinge...Mathias Agopian2011-06-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am d5244e0a: am 52a43990: Revert "revert surfaceflinger leak fix as it uncove...Mathias Agopian2011-06-156-10/+90
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 52a43990: Revert "revert surfaceflinger leak fix as it uncovered a crasher...Mathias Agopian2011-06-156-10/+90
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"Mathias Agopian2011-06-156-10/+90
* | | | | | | | am 85c14352: (-s ours) am 7ecdeb6e: am d20d72d1: Merge "revert surfaceflinger...Mathias Agopian2011-06-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7ecdeb6e: am d20d72d1: Merge "revert surfaceflinger leak fix as it uncover...Mathias Agopian2011-06-156-90/+10
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am d20d72d1: Merge "revert surfaceflinger leak fix as it uncovered a crasher ...Mathias Agopian2011-06-156-90/+10
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "revert surfaceflinger leak fix as it uncovered a crasher on xoom" into...Mathias Agopian2011-06-156-90/+10
| | | |\ \ \ \ \
| | | | * | | | | revert surfaceflinger leak fix as it uncovered a crasher on xoomMathias Agopian2011-06-156-90/+10
* | | | | | | | | Merge "Future-proofing: change Alignment interface to abstract class and add ...Philip Milne2011-06-162-42/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Future-proofing: change Alignment interface to abstract class and add a param...Philip Milne2011-06-152-42/+48
* | | | | | | | | | Merge "VPN: migrate from generic Bundle to our own Parcelable VpnConfig."Chia-chi Yeh2011-06-166-64/+129
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | VPN: migrate from generic Bundle to our own Parcelable VpnConfig.Chia-chi Yeh2011-06-156-64/+129
* | | | | | | | | | | Merge "-Fix some typo -Remove one unnecessary memory allocation"Gloria Wang2011-06-164-31/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | -Fix some typoGloria Wang2011-06-154-31/+29
* | | | | | | | | | | | Merge f28f1de3 - regen current.txtJean-Baptiste Queru2011-06-162-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 413b53b5: am 70921d61: Merge "We must keep up with the Joneses." into hone...Dianne Hackborn2011-06-152-0/+29
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2Dianne Hackborn2011-06-152-0/+29
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "We must keep up with the Joneses." into honeycomb-mr2Dianne Hackborn2011-06-152-0/+29
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | We must keep up with the Joneses.Dianne Hackborn2011-06-152-0/+29
| | | | | |_|_|/ / / / / | | | | |/| | | | | | |
* | | | | | | | | | | | am a5608e3a: (-s ours) am c0e84cf3: am 5e451faa: Merge "Import revised transl...Eric Fischer2011-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am c0e84cf3: am 5e451faa: Merge "Import revised translations. DO NOT MERGE" ...Eric Fischer2011-06-1581-444/+692
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycom...Eric Fischer2011-06-1581-444/+692
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2Eric Fischer2011-06-1581-444/+692
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-06-1581-444/+692
* | | | | | | | | | | | am 030a8c65: am a4644307: (-s ours) am df1734e3: Fix lease duration handlingIrfan Sheriff2011-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am a4644307: (-s ours) am df1734e3: Fix lease duration handlingIrfan Sheriff2011-06-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am df1734e3: Fix lease duration handlingIrfan Sheriff2011-06-151-12/+19
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix lease duration handlingIrfan Sheriff2011-06-151-12/+19
* | | | | | | | | | | | | | Merge "Don't enforce defaults any more in the TextToSpeech API."Narayan Kamath2011-06-163-77/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Don't enforce defaults any more in the TextToSpeech API.Narayan Kamath2011-06-163-77/+14
* | | | | | | | | | | | | | | Merge "Fix crash determining direction of invalid locale"Kenny Root2011-06-162-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix crash determining direction of invalid localeKenny Root2011-06-162-2/+8