summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Bin...Brad Fitzpatrick2010-08-314-7/+33
|\
| * am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." i...Brad Fitzpatrick2010-08-314-7/+33
| |\
| | * Merge "Don't propagate StrictMode over one-way Binder calls." into gingerbreadBrad Fitzpatrick2010-08-314-7/+33
| | |\
| | | * Don't propagate StrictMode over one-way Binder calls.Brad Fitzpatrick2010-08-314-7/+33
* | | | Merge "Fixing uniform binding for fragment shader. Updating the glsl fragment...Alex Sakhartchouk2010-08-317-136/+159
|\ \ \ \
| * | | | Fixing uniform binding for fragment shader.Alex Sakhartchouk2010-08-317-136/+159
* | | | | am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP pack...Andreas Huber2010-08-314-6/+345
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-...Andreas Huber2010-08-314-6/+345
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-h...Andreas Huber2010-08-314-6/+345
| | |\ \ \
| | | * | | Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.Andreas Huber2010-08-314-6/+345
* | | | | | am e1a3cddd: am 99fa510e: Merge "Better detection of connection problems - ti...Andreas Huber2010-08-312-43/+67
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 99fa510e: Merge "Better detection of connection problems - timeout if no r...Andreas Huber2010-08-312-43/+67
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Better detection of connection problems - timeout if no rtcp packets a...Andreas Huber2010-08-312-43/+67
| | |\ \ \ \
| | | * | | | Better detection of connection problems - timeout if no rtcp packets arrive w...Andreas Huber2010-08-312-43/+67
| | | |/ / /
* | | | | | am 04bc8070: am 6659284d: Allow Bluetooth radio to be toggled in Airplane mode.Jake Hamby2010-08-313-60/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6659284d: Allow Bluetooth radio to be toggled in Airplane mode.Jake Hamby2010-08-313-60/+23
| |\ \ \ \ \ | | |/ / / /
| | * | | | Allow Bluetooth radio to be toggled in Airplane mode.Jake Hamby2010-08-313-60/+23
* | | | | | Merge "Fix crash when proxy exclusion list is null."Andrew Stadler2010-08-311-3/+8
|\ \ \ \ \ \
| * | | | | | Fix crash when proxy exclusion list is null.Andrew Stadler2010-08-311-3/+8
* | | | | | | am b4649ec7: am 23827557: Merge "Add a --debug-mode option to aapt." into gin...Xavier Ducrohet2010-08-313-3/+18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 23827557: Merge "Add a --debug-mode option to aapt." into gingerbreadXavier Ducrohet2010-08-313-3/+18
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Add a --debug-mode option to aapt." into gingerbreadXavier Ducrohet2010-08-313-3/+18
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Add a --debug-mode option to aapt.Xavier Ducrohet2010-08-313-3/+18
* | | | | | | Merge "MTP: Send an Intent after an MTP session that resulted in media databa...Mike Lockwood2010-08-315-0/+73
|\ \ \ \ \ \ \
| * | | | | | | MTP: Send an Intent after an MTP session that resulted in media database modi...Mike Lockwood2010-08-315-0/+73
* | | | | | | | am b7ab3420: Ignore changes from open-source master that are already hereJean-Baptiste Queru2010-08-310-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Ignore changes from open-source master that are already hereJean-Baptiste Queru2010-08-310-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "GPS: Initialize XTRA support when GPS is enabled"Mike Lockwood2010-08-311-2/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | GPS: Initialize XTRA support when GPS is enabledMike Lockwood2010-08-301-2/+6
| | * | | | | | | | Merge "GPS: Don't set XTRA download pending flag at boot time."Mike Lockwood2010-08-311-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | GPS: Don't set XTRA download pending flag at boot time.Mike Lockwood2010-08-301-2/+2
* | | | | | | | | | Update API to fix the build.Eric Fischer2010-08-311-27/+27
* | | | | | | | | | Merge "Add settings option for running MTP server in PTP mode."Mike Lockwood2010-08-315-9/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add settings option for running MTP server in PTP mode.Mike Lockwood2010-08-315-9/+61
* | | | | | | | | | | Merge "USB: Add functions for querying if a USB function is supported and ena...Mike Lockwood2010-08-311-0/+30
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | USB: Add functions for querying if a USB function is supported and enabled.Mike Lockwood2010-08-311-0/+30
* | | | | | | | | | | am aa40b834: am 6aacad66: Merge "Add some encoding parameters for the "record...James Dong2010-08-311-1/+19
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 6aacad66: Merge "Add some encoding parameters for the "record" utility" in...James Dong2010-08-311-1/+19
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Add some encoding parameters for the "record" utility" into gingerbreadJames Dong2010-08-311-1/+19
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add some encoding parameters for the "record" utilityJames Dong2010-08-311-1/+19
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
* | | | | | | | | | | am b1824cfc: am 54901c9e: fix the build. will revisit this change in a minuteJoe Onorato2010-08-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 54901c9e: fix the build. will revisit this change in a minuteJoe Onorato2010-08-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | fix the build. will revisit this change in a minuteJoe Onorato2010-08-311-16/+16
* | | | | | | | | | | am 5238c5f9: fix the build. will revisit this change in a minuteJoe Onorato2010-08-311-15/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | fix the build. will revisit this change in a minuteJoe Onorato2010-08-311-16/+16
* | | | | | | | | | Merge "Added VideoSourceDownSampler"Nipun Kwatra2010-08-313-0/+240
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added VideoSourceDownSamplerNipun Kwatra2010-08-313-0/+240
* | | | | | | | | | | Merge "Added setAuxiliaryOutputFile to MediaRecorder and JNI"Nipun Kwatra2010-08-319-0/+128
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Added setAuxiliaryOutputFile to MediaRecorder and JNINipun Kwatra2010-08-319-0/+128
* | | | | | | | | | | Merge "Adding support for parallel recording sessions."Nipun Kwatra2010-08-313-36/+198
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /