summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Media scanner support for tracking files of arbitrary type.Mike Lockwood2010-09-122-31/+9
* am ec06144c: am 36edb202: Merge "Make DRM libraries optional"Jean-Baptiste Queru2010-09-124-2/+7
|\
| * am 36edb202: Merge "Make DRM libraries optional"Jean-Baptiste Queru2010-09-124-2/+7
| |\
| | * Make DRM libraries optionalJean-Baptiste Queru2010-09-104-2/+7
* | | Exposing specific profile levels + hasProfile().Nipun Kwatra2010-09-102-6/+10
* | | Merge branch 'master' of ssh://android-git:29418/platform/frameworks/baseJean-Michel Trivi2010-09-102-6/+25
|\ \ \
| * \ \ Merge "Adding hasProfile."Nipun Kwatra2010-09-102-6/+25
| |\ \ \
| | * | | Adding hasProfile.Nipun Kwatra2010-09-102-6/+25
* | | | | am e3dabc4b: am beeb71df: fix buildJean-Baptiste Queru2010-09-101-2/+7
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am beeb71df: fix buildJean-Baptiste Queru2010-09-101-2/+7
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | fix buildJean-Baptiste Queru2010-09-091-2/+7
* | | | | am 03b3eda2: am 862438eb: fix buildJean-Baptiste Queru2010-09-101-2/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 862438eb: fix buildJean-Baptiste Queru2010-09-101-2/+7
| |\ \ \ \ | | |/ / /
| | * | | fix buildJean-Baptiste Queru2010-09-091-2/+7
* | | | | am 3b3d2160: am 7547b8ea: fix buildJean-Baptiste Queru2010-09-101-2/+7
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | am 7547b8ea: fix buildJean-Baptiste Queru2010-09-101-2/+7
| |\ \ \ | | |/ /
| | * | fix buildJean-Baptiste Queru2010-09-091-2/+7
* | | | Merge "Added specific resolution and time lapse profiles."Nipun Kwatra2010-09-102-2/+62
|\ \ \ \ | | |_|/ | |/| |
| * | | Added specific resolution and time lapse profiles.Nipun Kwatra2010-09-102-2/+62
* | | | am ea4680f0: am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbreadEric Laurent2010-09-104-135/+69
|\ \ \ \ | | |/ / | |/| |
| * | | am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbreadEric Laurent2010-09-104-135/+69
| |\ \ \
| | * \ \ Merge "LVM release 1.09 delivery" into gingerbreadEric Laurent2010-09-104-135/+69
| | |\ \ \
| | | * | | LVM release 1.09 deliveryEric Laurent2010-09-094-135/+69
* | | | | | am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aospJean-Baptiste Queru2010-09-1048-0/+8268
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aospJean-Baptiste Queru2010-09-1048-0/+8268
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Initial contribution from Sony Corporation.aimitakeshi2010-09-0148-0/+8268
* | | | | | am 0d661b5e: am ff4c57ad: Merge "TimedEventQueue now explicitly sets its sche...Andreas Huber2010-09-091-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy...Andreas Huber2010-09-091-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | TimedEventQueue now explicitly sets its scheduling policy to foreground as it...Andreas Huber2010-09-091-0/+4
* | | | | | Merge "Only enable CAMERA_MSG_PREVIEW_FRAME when necessary."Wu-cheng Li2010-09-091-14/+5
|\ \ \ \ \ \
| * | | | | | Only enable CAMERA_MSG_PREVIEW_FRAME when necessary.Wu-cheng Li2010-09-091-14/+5
* | | | | | | am 8986f62b: am f3de053c: Merge "Instead of asserting return a runtime error ...Andreas Huber2010-09-091-1/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am f3de053c: Merge "Instead of asserting return a runtime error if the maximu...Andreas Huber2010-09-091-1/+5
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Instead of asserting return a runtime error if the maximum sample size...Andreas Huber2010-09-091-1/+5
| | |\ \ \ \ \
| | | * | | | | Instead of asserting return a runtime error if the maximum sample size cannot...Andreas Huber2010-09-091-1/+5
* | | | | | | | am e19df3dc: am 5c43a7af: Merge "When 32-bit offset is used, if the requested...James Dong2010-09-091-3/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file siz...James Dong2010-09-091-3/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "When 32-bit offset is used, if the requested max file size is greater ...James Dong2010-09-091-3/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | When 32-bit offset is used,James Dong2010-09-081-3/+4
* | | | | | | | am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if a...Andreas Huber2010-09-092-40/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extracto...Andreas Huber2010-09-092-40/+41
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3...Andreas Huber2010-09-092-40/+41
| | | |_|_|/ / | | |/| | | |
* | | | | | | am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via kKeyT...James Dong2010-09-085-4/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each...James Dong2010-09-085-4/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer...James Dong2010-09-085-4/+7
| | |\ \ \ \ \
| | | * | | | | HW audio encoder expects timestamp via kKeyTime from each input bufferJames Dong2010-09-085-4/+7
| | | |/ / / /
* | | | | | | am e126119c: am 95d86480: Merge "Modify type of some environmental reverb par...Eric Laurent2010-09-082-24/+26
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am 95d86480: Merge "Modify type of some environmental reverb parameters" into...Eric Laurent2010-09-082-24/+26
| |\ \ \ \ \ | | |/ / / /
| | * | | | Modify type of some environmental reverb parametersEric Laurent2010-09-082-24/+26
| | |/ / /
* | | | | Don't assert on unexpected surface flinger dequeue/enqueueBuffer errors, log ...Andreas Huber2010-09-071-2/+9