summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Contacts contract update for display photos."Dave Santoro2011-07-132-9/+244
|\
| * Contacts contract update for display photos.Dave Santoro2011-07-132-9/+244
* | Merge "Add StorageVolume list to MountService dump"Kenny Root2011-07-132-1/+17
|\ \
| * | Add StorageVolume list to MountService dumpKenny Root2011-07-132-1/+17
* | | Merge "Fix debugging for hwui caches"Kenny Root2011-07-132-2/+1
|\ \ \
| * | | Fix debugging for hwui cachesKenny Root2011-07-132-2/+1
| |/ /
* | | Merge "Allow a sync adapter to provide an OPEN action for a group"Daniel Lehmann2011-07-132-0/+25
|\ \ \
| * | | Allow a sync adapter to provide an OPEN action for a groupDaniel Lehmann2011-07-132-0/+25
* | | | Merge "Compress the backup output stream"Christopher Tate2011-07-133-25/+136
|\ \ \ \
| * | | | Compress the backup output streamChristopher Tate2011-07-133-25/+136
* | | | | Merge "Control socket tagging through Settings.Secure."Jeff Sharkey2011-07-132-25/+34
|\ \ \ \ \
| * | | | | Control socket tagging through Settings.Secure.Jeff Sharkey2011-07-132-25/+34
* | | | | | Merge "Remove old-style software decoders."Andreas Huber2011-07-1322-3139/+7
|\ \ \ \ \ \
| * | | | | | Remove old-style software decoders.Andreas Huber2011-07-1322-3139/+7
* | | | | | | am 0814a9aa: am db4c5f35: resolved conflicts for merge of 7816eded to gingerb...David 'Digit' Turner2011-07-130-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aospDavid 'Digit' Turner2011-07-110-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ resolved conflicts for merge of 7816eded to gingerbread-plus-aospDavid 'Digit' Turner2011-07-120-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ merge intel x86 patches into gingerbread branchDavid 'Digit' Turner2011-07-083-3/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | NativeDaemonConnector: Fix SDCard mounting bug in the emulator.David 'Digit' Turner2011-07-071-1/+2
| | | | * | | | | | | Fix missing NLBruce Beare2011-07-072-2/+1
| | | |/ / / / / / /
* | | | | | | | | | am 9b446cd6: am bc047bb0: am e32c49ab: docs: de-new sidenavsScott Main2011-07-132-10/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am bc047bb0: am e32c49ab: docs: de-new sidenavsScott Main2011-07-112-10/+5
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am e32c49ab: docs: de-new sidenavsScott Main2011-07-112-10/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | docs: de-new sidenavsScott Main2011-07-112-10/+5
* | | | | | | | | | | | am 4e400158: am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d...Robert Ly2011-07-133-14/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba2...Robert Ly2011-07-113-14/+62
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a4...Robert Ly2011-07-113-14/+62
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66aRobert Ly2011-07-113-14/+62
* | | | | | | | | | | | am 22f4e8f6: am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboardScott Main2011-07-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboardScott Main2011-07-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am d3fa7bd1: docs: fix date on opengl dashboardScott Main2011-07-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | docs: fix date on opengl dashboardScott Main2011-07-111-1/+1
* | | | | | | | | | | | am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-131-0/+60
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-111-0/+60
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am d292d2a0: Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-111-0/+60
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge 36a3a392 from mr1.Xavier Ducrohet2011-07-111-0/+60
* | | | | | | | | | | Merge "MediaScanner: fix breakage in updates"Mike Lockwood2011-07-131-5/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MediaScanner: fix breakage in updatesMike Lockwood2011-07-131-5/+18
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "docs: fix for bug 3186839"Robert Ly2011-07-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | docs: fix for bug 3186839Robert Ly2011-07-131-2/+2
* | | | | | | | | | | | Merge "Polish of the ActivityChooserView and ShareActionProvider."Svetoslav Ganov2011-07-1314-375/+262
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Polish of the ActivityChooserView and ShareActionProvider.Svetoslav Ganov2011-07-1314-375/+262
* | | | | | | | | | | | | Merge "Add REFER handling."repo sync2011-07-133-30/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add REFER handling.repo sync2011-07-133-30/+133
* | | | | | | | | | | | | | Merge "Tile profiling interface"Chris Craik2011-07-131-0/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Tile profiling interfaceChris Craik2011-07-131-0/+55
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "get rid of overlay HAL"Mathias Agopian2011-07-131-10/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | get rid of overlay HALMathias Agopian2011-07-121-10/+0
* | | | | | | | | | | | | | | Merge "Revert "fix a weird use of Vector::appendVector()""Jeff Brown2011-07-131-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Revert "fix a weird use of Vector::appendVector()"Jeff Brown2011-07-131-2/+5