summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Clean up GenerationCache.Jeff Brown2011-11-111-59/+49
* | | | am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of v...Mathias Agopian2011-11-141-2/+10
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Define, document, and test the behavior of very large SurfaceTexturesMathias Agopian2011-11-111-2/+10
* | | am 510180f1: am 08e42967: Merge "Add support for retrieving location informat...James Dong2011-11-112-0/+2
|\ \ \ | |/ /
| * | Add support for retrieving location information in mp4/3gpp filesJames Dong2011-11-102-0/+2
| |/
* | resolved conflicts for merge of 26f70db9 to masterAndreas Huber2011-11-083-5/+0
|\ \ | |/
| * Merge "Remove surface legacy APIs and code." into ics-mr1Andreas Huber2011-11-083-5/+0
| |\
| | * Remove surface legacy APIs and code.Andreas Huber2011-10-283-5/+0
* | | am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.Jeff Brown2011-11-071-1/+2
|\ \ \ | |/ /
| * | am 5462bc63: Fix a leak in Parcel::writeBlob.Jeff Brown2011-11-051-1/+2
| |\ \
| | * | Fix a leak in Parcel::writeBlob.Jeff Brown2011-11-041-1/+2
* | | | am 236aea35: Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1Jamie Gennis2011-11-031-20/+87
|\ \ \ \ | |/ / /
| * | | Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1Jamie Gennis2011-11-031-20/+87
| |\ \ \
| | * | | BlobCache: implement cache serializationJamie Gennis2011-10-311-12/+84
| | * | | BlobCache: remove the mutex lockingJamie Gennis2011-10-311-8/+3
| | | |/ | | |/|
* | | | am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc."...Chih-Chung Chang2011-11-021-9/+11
|\ \ \ \ | |/ / /
| * | | am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0Chih-Chung Chang2011-11-011-9/+11
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge "Update camera continuous autofocus javadoc." into ics-mr0Chih-Chung Chang2011-10-311-9/+11
| | |\
| | | * Update camera continuous autofocus javadoc.Wu-cheng Li2011-10-281-9/+11
* | | | am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerServ...Jamie Gennis2011-10-281-3/+0
|\ \ \ \ | |/ / /
| * | | am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics...Jamie Gennis2011-10-281-3/+0
| |\ \ \ | | |/ /
| | * | Stagefright: ANW::connect in MediaPlayerServiceJamie Gennis2011-10-261-3/+0
* | | | am 5ded5fc5: am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing...Jamie Gennis2011-10-261-0/+1
|\ \ \ \ | |/ / /
| * | | am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into i...Jamie Gennis2011-10-261-0/+1
| |\ \ \ | | |/ /
| | * | Stagefright: push blank buffers when tearing downJamie Gennis2011-10-251-0/+1
| | |/
* | | Merge "Rename SensorChannel to BitTube"Mathias Agopian2011-10-263-8/+9
|\ \ \
| * | | Rename SensorChannel to BitTubeMathias Agopian2011-10-203-8/+9
| |/ /
* | | Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGESteve Block2011-10-251-2/+2
* | | Use libcorkscrew for stack unwinding.Jeff Brown2011-10-221-5/+3
|/ /
* | am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-191-0/+3
|\ \ | |/
| * Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-191-0/+3
| |\
| | * Stagefright: idle OMX after ANW errorsJamie Gennis2011-10-191-0/+3
* | | am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0Dave Burke2011-10-181-0/+1
|\ \ \ | |/ /
| * | Add a LayerScreenshotMathias Agopian2011-10-181-0/+1
| |/
* | am 9a0732af: Merge "SensorManager reconnects to sensor service when the later...Mathias Agopian2011-10-171-4/+16
|\ \ | |/
| * Merge "SensorManager reconnects to sensor service when the later dies" into i...Mathias Agopian2011-10-171-4/+16
| |\
| | * SensorManager reconnects to sensor service when the later diesMathias Agopian2011-10-161-4/+16
* | | am 840b8a67: Revert "Add a LayerScreenshot"Mathias Agopian2011-10-171-1/+0
|\ \ \ | |/ /
| * | Revert "Add a LayerScreenshot"Mathias Agopian2011-10-161-1/+0
| |/
* | Merge branch 'master' of ssh://android-git:29418/platform/frameworks/baseElliott Hughes2011-10-172-5/+7
|\ \
| * \ Merge changes I4e5ff00c,Id5e3ca1d,I97cbba61Jamie Gennis2011-10-172-5/+7
| |\ \
| | * | SurfaceFlinger: Remove display freezing codeJamie Gennis2011-10-141-2/+0
| | * | SurfaceFlinger: make sync transactions explicitJamie Gennis2011-10-142-3/+7
* | | | am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0Mathias Agopian2011-10-171-0/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add a LayerScreenshotMathias Agopian2011-10-141-0/+1
* | | Merge "Deprecate local-only CursorWindows."Jeff Brown2011-10-141-2/+1
|\ \ \ | |_|/ |/| |
| * | Deprecate local-only CursorWindows.Jeff Brown2011-10-121-2/+1
* | | Merge "Support for an MPEG2 Program Stream extractor."Andreas Huber2011-10-131-1/+4
|\ \ \
| * | | Support for an MPEG2 Program Stream extractor.Andreas Huber2011-09-301-1/+4
* | | | am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0Wu-cheng Li2011-10-121-10/+21
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|