summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge "Extract out audio DSP code to utility library"Glenn Kasten2011-12-165-117/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Extract out audio DSP code to utility libraryGlenn Kasten2011-12-165-117/+11
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealer"Jeff Brown2011-12-161-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix invalid madvise() during concurrent alloc/dealloc of MemoryDealerJi-Hwan Lee2011-12-151-1/+5
* | | | | | | | | | | | | | | | | Merge "Fix the JNI documentation for ICS."Elliott Hughes2011-12-161-17/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix the JNI documentation for ICS.Elliott Hughes2011-12-161-17/+34
* | | | | | | | | | | | | | | | | Merge "Make Property objects in View final"Chet Haase2011-12-163-30/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Make Property objects in View finalChet Haase2011-12-163-30/+30
* | | | | | | | | | | | | | | | | Merge "Use switch in AudioMixer::setParameter"Glenn Kasten2011-12-162-36/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use switch in AudioMixer::setParameterGlenn Kasten2011-12-162-36/+49
* | | | | | | | | | | | | | | | | | deleteTrackName now asserts on bad input parameterGlenn Kasten2011-12-161-17/+16
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am a2086cfc: am df440164: docs: add driver info for HisenseScott Main2011-12-162-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am df440164: docs: add driver info for HisenseScott Main2011-12-162-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | docs: add driver info for HisenseScott Main2011-12-162-2/+16
* | | | | | | | | | | | | | | | Merge "Add plumbing for dumping database info using dumpsys."Jeff Brown2011-12-165-0/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add plumbing for dumping database info using dumpsys.Jeff Brown2011-12-165-0/+101
* | | | | | | | | | | | | | | | | Merge "Make SQLiteQuery and SQLiteProgram final."Jeff Brown2011-12-165-37/+46594
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Make SQLiteQuery and SQLiteProgram final.Jeff Brown2011-12-165-37/+46594
* | | | | | | | | | | | | | | | | Merge "Raise default connection pool size."Jeff Brown2011-12-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Raise default connection pool size.Jeff Brown2011-12-161-2/+2
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Don't forget to close files."Dianne Hackborn2011-12-161-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Don't forget to close files.Dianne Hackborn2011-12-151-1/+14
* | | | | | | | | | | | | | | | | Merge "Add a new ui mode for "appliance""Joe Onorato2011-12-169-6/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add a new ui mode for "appliance"Joe Onorato2011-12-159-6/+30
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am 8cffc318: am a8001e2a: am 00697a90: docs: Add missing intent flag to Andro...Roman Nurik2011-12-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav classRoman Nurik2011-12-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 00697a90: docs: Add missing intent flag to Android U nav classRoman Nurik2011-12-161-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | docs: Add missing intent flag to Android U nav classRoman Nurik2011-12-161-2/+2
* | | | | | | | | | | | | | | | | am 9edb26ea: am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for M...Justin Ho2011-12-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1Justin Ho2011-12-164-42/+204
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1Justin Ho2011-12-164-42/+204
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Cherry-picking Id45abeba and Ia065dec6 for MR1Makoto Onuki2011-12-134-42/+204
* | | | | | | | | | | | | | | | | | Merge "Include roaming in NetworkIdentity.hashCode()."Jeff Sharkey2011-12-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Include roaming in NetworkIdentity.hashCode().Jeff Sharkey2011-12-161-1/+1
* | | | | | | | | | | | | | | | | | am f5ed1d4c: am 6469ee80: Merge "Fixed table labelling issues in \'Multiple D...Alexander Lucas2011-12-161-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am 6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' m...Alexander Lucas2011-12-161-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk les...Alexander Lucas2011-12-161-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Fixed table labelling issues in 'Multiple Dimensions' multiple apk lessonAlexander Lucas2011-12-161-2/+4
* | | | | | | | | | | | | | | | | | | am 5e7bed0b: am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1Scott Main2011-12-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1Scott Main2011-12-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "docs: fix whitespace in sidenav" into ics-mr1Scott Main2011-12-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | docs: fix whitespace in sidenavScott Main2011-12-161-1/+1
* | | | | | | | | | | | | | | | | | | | am 1410f8a2: am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android...Roman Nurik2011-12-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" int...Roman Nurik2011-12-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0Roman Nurik2011-12-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | / / / / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "docs: Minor link fix in Android U class" into ics-mr0Roman Nurik2011-12-161-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | docs: Minor link fix in Android U classRoman Nurik2011-12-161-1/+1
* | | | | | | | | | | | | | | | | | | | am 590ba7a4: am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics...Bill Gruber2011-12-169-67/+1869
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0Bill Gruber2011-12-169-67/+1869
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0Bill Gruber2011-12-169-67/+1869
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /