summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix potential leak in TextLayouCacheFabrice Di Meglio2011-09-182-3/+25
* Merge "Retain DNS information from DHCP request"Irfan Sheriff2011-09-182-9/+41
|\
| * Retain DNS information from DHCP requestIrfan Sheriff2011-09-162-9/+41
* | Merge "Revert "Fix bug #5332081 TextLayoutCache needs to be able to have more...Fabrice Di Meglio2011-09-187-306/+240
|\ \
| * | Revert "Fix bug #5332081 TextLayoutCache needs to be able to have more cache ...Fabrice Di Meglio2011-09-187-306/+240
* | | Merge "doc change: fix attr name"Dirk Dougherty2011-09-171-1/+1
|\ \ \
| * | | doc change: fix attr nameDirk Dougherty2011-09-171-1/+1
* | | | doc change: fix typoDirk Dougherty2011-09-171-1/+1
|/ / /
* | | am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryromJeff Brown2011-09-163-2/+5
|\ \ \
| * \ \ Merge "Can't stop the fling! Bug: 5335420" into ics-factoryromJeff Brown2011-09-163-2/+5
| |\ \ \
| | * | | Can't stop the fling!Jeff Brown2011-09-163-2/+5
* | | | | am 259db3f6: Merge "Have all connections disconnected before turning off radi...Wink Saville2011-09-162-10/+25
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Have all connections disconnected before turning off radio." into ics-...Wink Saville2011-09-162-10/+25
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Have all connections disconnected before turning off radio.Wink Saville2011-09-162-10/+25
* | | | | Merge "Revert "Forces AsyncTask to use the main looper Bug #5333924""Jeff Brown2011-09-161-7/+1
|\ \ \ \ \
| * | | | | Revert "Forces AsyncTask to use the main looper Bug #5333924"Jeff Brown2011-09-161-7/+1
* | | | | | Merge "Force an update before we poll for the data."Tsu Chiang Chuang2011-09-161-0/+1
|\ \ \ \ \ \
| * | | | | | Force an update before we poll for the data.Tsu Chiang Chuang2011-09-151-0/+1
* | | | | | | Merge "add upload capabilities to data test."Tsu Chiang Chuang2011-09-163-2/+75
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | add upload capabilities to data test.Tsu Chiang Chuang2011-09-153-2/+75
* | | | | | | am 1afeea0f: (-s ours) Merge "work around a problem where fp registers get co...Mathias Agopian2011-09-160-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)"...Mathias Agopian2011-09-161-1/+5
| |\ \ \ \ \ \
| | * | | | | | work around a problem where fp registers get corrupted (DO NOT MERGE)Mathias Agopian2011-09-161-1/+5
* | | | | | | | Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache h...Fabrice Di Meglio2011-09-167-240/+306
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Fix bug #5332081 TextLayoutCache needs to be able to have more cache hitsFabrice Di Meglio2011-09-167-240/+306
* | | | | | | | Merge "Forces AsyncTask to use the main looper Bug #5333924"Romain Guy2011-09-161-1/+7
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Forces AsyncTask to use the main looperRomain Guy2011-09-161-1/+7
* | | | | | | | Merge "Clarify documentation of AdapterView.OnItemSelectedListener Bug #5331587"Romain Guy2011-09-161-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify documentation of AdapterView.OnItemSelectedListenerRomain Guy2011-09-161-2/+4
| |/ / / / / / /
* | | | | | | | am a2a960b4: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-09-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-16149-4035/+3182
| |\ \ \ \ \ \
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-09-16149-4035/+3182
* | | | | | | | Merge "Fix "am profile" when run on system_server."Jeff Sharkey2011-09-161-29/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix "am profile" when run on system_server.Jeff Sharkey2011-09-151-29/+48
* | | | | | | | | am f79ec360: Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" i...Jean-Michel Trivi2011-09-161-0/+4
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" into ics-facto...Jean-Michel Trivi2011-09-161-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix bug 5327199 Recycle bitmaps in RemoteControlClientJean-Michel Trivi2011-09-161-0/+4
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | am 218148f1: Merge "Revert "Adding selected state for scrubber control"" into...Justin Ho2011-09-1616-4/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Revert "Adding selected state for scrubber control"" into ics-factoryromJustin Ho2011-09-1616-4/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Adding selected state for scrubber control"Justin Ho2011-09-1616-4/+3
* | | | | | | | | | Merge "Don't switch to handle drag mode when starting selection"John Reck2011-09-161-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't switch to handle drag mode when starting selectionJohn Reck2011-09-161-1/+0
* | | | | | | | | | | am 5855c0ca: Merge "Adding selected state for scrubber control" into ics-fact...Justin Ho2011-09-1616-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Adding selected state for scrubber control" into ics-factoryromJustin Ho2011-09-1616-3/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Adding selected state for scrubber controlJustin Ho2011-09-1616-3/+4
* | | | | | | | | | | Merge "AudioResampler: use relative instead of absolute labels"Nick Kralevich2011-09-161-8/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | AudioResampler: use relative instead of absolute labelsNick Kralevich2011-09-161-8/+8
* | | | | | | | | | | | am a82f4483: (-s ours) Merge "Make LTE_FLOAT a strict weak order. (DO NOT MER...Jeff Brown2011-09-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ...Jeff Brown2011-09-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Make LTE_FLOAT a strict weak order. (DO NOT MERGE)Jeff Brown2011-09-161-1/+1
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |