summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts ...Andreas Huber2011-05-261-0/+1
|\
| * Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-251-0/+1
* | Merge "For out of band timed text support (timed text in a separate file)."Gloria Wang2011-05-251-0/+1
|\ \
| * | For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-251-0/+1
* | | SurfaceTexture: clean up some comments, tests, etc.Jamie Gennis2011-05-251-20/+45
| |/ |/|
* | Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4...Jeff Brown2011-05-241-2/+8
|\ \
| * | Support wrapping app processes to inject debug instrumentation.Jeff Brown2011-05-241-2/+8
| |/
* | resolved conflicts for merge of bbca8133 to masterDianne Hackborn2011-05-241-0/+1
|\ \ | |/ |/|
| * am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2Dianne Hackborn2011-05-231-0/+1
| |\
| | * Add "television" mode.Dianne Hackborn2011-05-231-0/+1
* | | resolved conflicts for merge of 06a8ceac to masterDianne Hackborn2011-05-191-46/+80
|\ \ \ | |/ /
| * | am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-191-46/+80
| |\ \ | | |/
| | * Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-191-46/+80
| * | am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit...Gloria Wang2011-05-182-9/+24
| |\ \ | | |/
| | * Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into h...Gloria Wang2011-05-182-9/+24
| | |\
| | | * DO NOT MERGEGloria Wang2011-05-132-9/+24
| * | | am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen widt...Dianne Hackborn2011-05-131-2/+65
| |\ \ \ | | |/ /
| | * | DO NOT MERGE. Integrate add new screen width/height in "dp" configs.Dianne Hackborn2011-05-121-2/+65
| | |/
| * | am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward...Jean-Baptiste Queru2011-05-121-3/+3
| |\ \
| | * | Tweak audio APIs for better forward/backward/sideways compatibility.Jean-Baptiste Queru2011-05-121-3/+3
* | | | Merge "RefBase subclasses can now decide how they want to be destroyed."Mathias Agopian2011-05-191-2/+8
|\ \ \ \
| * | | | RefBase subclasses can now decide how they want to be destroyed.Mathias Agopian2011-05-191-2/+8
* | | | | Merge "Add auto-white balance locking to the Camera API."Eino-Ville Talvala2011-05-181-15/+44
|\ \ \ \ \
| * | | | | Add auto-white balance locking to the Camera API.Eino-Ville Talvala2011-05-171-15/+44
* | | | | | Revert "Add const to the finders method in MetaData.cpp"James Dong2011-05-172-7/+7
* | | | | | Make track informational event optional, depending on system propertyJames Dong2011-05-171-0/+3
| |/ / / / |/| | | |
* | | | | Support platform and camera dependent recording start time offsetJames Dong2011-05-141-0/+3
* | | | | Merge "Add support for platform-specific recording start time offset"James Dong2011-05-131-0/+9
|\ \ \ \ \
| * | | | | Add support for platform-specific recording start time offsetJames Dong2011-05-101-0/+9
* | | | | | Support for storing geo information in the recorded mp4/3gpp file.James Dong2011-05-131-0/+9
* | | | | | Merge "Add one more DRM error code. For bug 4422428."Gloria Wang2011-05-132-0/+2
|\ \ \ \ \ \
| * | | | | | Add one more DRM error code. For bug 4422428.Gloria Wang2011-05-132-0/+2
* | | | | | | Merge "Add initial API for stylus and mouse buttons."Jeff Brown2011-05-132-15/+50
|\ \ \ \ \ \ \
| * | | | | | | Add initial API for stylus and mouse buttons.Jeff Brown2011-05-132-15/+50
* | | | | | | | update for new audio.h header locationDima Zavin2011-05-124-4/+4
|/ / / / / / /
* | | | | | | Merge "Squashed commit of the following:"Andreas Huber2011-05-122-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Squashed commit of the following:Andreas Huber2011-05-112-0/+2
| |/ / / / / /
* | | | | | | fix onFrameAvailableMathias Agopian2011-05-111-0/+10
* | | | | | | Add SurfaceTexture loggingMathias Agopian2011-05-111-0/+5
* | | | | | | Implement {Surface|SurfaceTextureClient}::setSwapInterval()Mathias Agopian2011-05-113-12/+39
* | | | | | | Add the concept of synchronous dequeueBuffer in SurfaceTextureMathias Agopian2011-05-111-21/+50
* | | | | | | unify SurfaceTexture and SurfaceMathias Agopian2011-05-112-0/+11
* | | | | | | Fix a bug where setgeometry couldn't be undoneMathias Agopian2011-05-112-11/+6
| |_|/ / / / |/| | | | |
* | | | | | Full local backup infrastructureChristopher Tate2011-05-101-1/+12
|/ / / / /
* | | | | Merge "resolved conflicts for merge of 05be6d6f to master"Dianne Hackborn2011-05-101-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | resolved conflicts for merge of 05be6d6f to masterDianne Hackborn2011-05-091-0/+2
| |\ \ \ \ | | |/ / /
| | * | | am 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling w...Dianne Hackborn2011-05-091-0/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Better compat mode part one: start scaling windows.Dianne Hackborn2011-05-091-0/+2
| | | * | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-031-3/+2
| | * | | am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature fo...Mike Lockwood2011-05-041-3/+2
| | |\ \ \