summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am e14923b0: am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-la...Andreas Huber2010-08-091-0/+2
|\
| * Support for extracting G.711 a-law and mu-law audio from WAV files and a corr...Andreas Huber2010-08-091-0/+2
* | am d7ce227b: am 818490ab: Fix String8::operator+Kenny Root2010-08-061-2/+2
|\ \ | |/
| * Fix String8::operator+Kenny Root2010-08-061-2/+2
* | am 9c09a605: am 1441bdfc: Merge "Use the target color format from the camera ...James Dong2010-08-051-0/+5
|\ \ | |/
| * Merge "Use the target color format from the camera source if possible" into g...James Dong2010-08-051-0/+5
| |\
| | * Use the target color format from the camera source if possibleJames Dong2010-08-051-0/+5
| * | Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-041-0/+1
| |/
* | am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 ...Andreas Huber2010-08-052-0/+4
|\ \ | |/
| * Support for Gtalk video, includes AMR/H.263 assembler and packetization suppo...Andreas Huber2010-08-042-0/+4
* | Adding parseSizesList, getSupportedPreviewSizes to CameraParameters.Nipun Kwatra2010-08-041-0/+1
* | am 9f6b16a2: am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers an...Chris Tate2010-08-041-1/+3
|\ \ | |/
| * Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into ginger...Chris Tate2010-08-031-1/+3
| |\
| | * Enhanced VelocityTracker for > 5 pointers and fixed bugs.Jeff Brown2010-07-301-1/+3
* | | am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread n...James Dong2010-08-041-0/+41
|\ \ \ | |/ /
| * | Merge "File writer has a designated writer thread now" into gingerbreadJames Dong2010-08-031-0/+41
| |\ \
| | * | File writer has a designated writer thread nowJames Dong2010-08-021-0/+41
| | |/
* | | am 51a260d8: am 23796e3b: Merge "Add lost frame handling in AudioSource" into...James Dong2010-08-031-3/+2
|\ \ \ | |/ /
| * | Merge "Add lost frame handling in AudioSource" into gingerbreadJames Dong2010-08-021-3/+2
| |\ \ | | |/ | |/|
| | * Add lost frame handling in AudioSourceJames Dong2010-07-301-3/+2
* | | Implementing getSupportedPictureSizesNipun Kwatra2010-08-021-3/+5
* | | Adding getSupportedPictureSizes which returns a Vector of supported Sizes.Nipun Kwatra2010-07-301-0/+16
* | | am 3b724c83: am 00e5c613: Merge "Improve thread safety of input mappers." int...Jeff Brown2010-07-301-67/+83
|\ \ \ | |/ /
| * | Merge "Improve thread safety of input mappers." into gingerbreadJeff Brown2010-07-301-67/+83
| |\ \
| | * | Improve thread safety of input mappers.Jeff Brown2010-07-301-67/+83
| * | | resolved conflicts for merge of 27eecb70 to gingerbreadJean-Baptiste Queru2010-07-303-3/+2
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base...The Android Open Source Project2010-07-293-3/+2
| | |\ \
| | | * | fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+2
| | * | | Squashed commit of the following:Andreas Huber2010-07-291-0/+4
| | |/ /
* | | | Add support for dalvik.vm.extra-opts property.Andy McFadden2010-07-301-0/+1
* | | | resolved conflicts for merge of 02513855 to masterMathias Agopian2010-07-292-1/+3
|\ \ \ \
| * \ \ \ am 050b5624: Added SensorManager.getMinDelay()Mathias Agopian2010-07-292-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Added SensorManager.getMinDelay()Mathias Agopian2010-07-292-1/+3
| | | |/ | | |/|
* | | | am 0c51c98f: am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+2
|\ \ \ \ | |/ / /
| * | | am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+2
| |\ \ \ | | |/ / | |/| |
| | * | fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+2
| * | | DO NOT MERGE: Fix input event injection ANRs on UI thread.Jeff Brown2010-07-292-17/+37
* | | | Merge "Support for video size to be different from captured picture size."Nipun Kwatra2010-07-291-0/+33
|\ \ \ \
| * | | | Support for video size to be different from captured picture size.Nipun Kwatra2010-07-291-0/+33
* | | | | Merge "Adding YUVImage and YUVCanvas."Nipun Kwatra2010-07-292-0/+241
|\ \ \ \ \ | |/ / / /
| * | | | Adding YUVImage and YUVCanvas.Nipun Kwatra2010-07-292-0/+241
* | | | | Fixed StatusBar ANRs due to input event injection on UI thread.Jeff Brown2010-07-292-17/+37
|/ / / /
* | | | am 9362ea76: am 9f2a91bc: Merge "fix [2873058] Surface::dequeueBuffer blocks ...Mathias Agopian2010-07-281-8/+0
|\ \ \ \ | |/ / /
| * | | Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. canno...Mathias Agopian2010-07-281-8/+0
| |\ \ \
| | * | | fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot deque...Mathias Agopian2010-07-271-8/+0
* | | | | am 1de9f490: am bae6fe24: Merge "Support streaming of compressed assets > 1 m...Christopher Tate2010-07-282-9/+84
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Support streaming of compressed assets > 1 megabyte" into gingerbreadChristopher Tate2010-07-282-9/+84
| |\ \ \ \
| | * | | | Support streaming of compressed assets > 1 megabyteChristopher Tate2010-07-282-9/+84
* | | | | | am 9795a25d: am 6d0fec2d: Refactor input reader to support new device types m...Jeff Brown2010-07-285-544/+770
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Refactor input reader to support new device types more easily.Jeff Brown2010-07-285-544/+770
| |/ / / /