summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am b021358d: am ec771223: Add support for common encryptionMarco Nelissen2013-04-083-0/+7
|\
| * Add support for common encryptionMarco Nelissen2013-04-083-0/+7
* | am c2ccb7d9: am d5ef30b2: Merge "Implement async event callout from drm plugi...Jeff Tinker2013-04-042-0/+51
|\ \ | |/
| * Merge "Implement async event callout from drm plugin to Java app" into jb-mr2...Jeff Tinker2013-04-052-0/+51
| |\
| | * Implement async event callout from drm plugin to Java appJeff Tinker2013-04-032-0/+51
* | | am 1ef63d1a: am a56e1506: Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-13/+49
|\ \ \ | |/ /
| * | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-13/+49
| |\ \ | | |/
| | * MediaDrm API updateJeff Tinker2013-04-011-13/+49
* | | am 790b6755: am 3a1d8b51: Merge "Camera: Add input side to camera3 HAL device...Eino-Ville Talvala2013-03-281-1/+19
|\ \ \ | |/ /
| * | Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-devEino-Ville Talvala2013-03-281-1/+19
| |\ \
| | * | Camera: Add input side to camera3 HAL deviceEino-Ville Talvala2013-03-271-1/+19
* | | | am 2a2f0ece: am 681be039: ToneGenerator: fix truncated tonesEric Laurent2013-03-271-0/+1
|\ \ \ \ | |/ / /
| * | | ToneGenerator: fix truncated tonesEric Laurent2013-03-271-0/+1
| |/ /
* | | am 2ec46421: am ad065d38: Merge "Camera: Add hotplug support (for fixed # of ...Igor Murashkin2013-03-271-5/+6
|\ \ \ | |/ /
| * | Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-devIgor Murashkin2013-03-271-5/+6
| |\ \ | | |/ | |/|
| | * Camera: Add hotplug support (for fixed # of cameras)Igor Murashkin2013-03-261-5/+6
* | | am 1e7d497c: am cd77d4a1: Identify network servers and clients with a OS vers...Andreas Huber2013-03-261-0/+3
|\ \ \ | |/ /
| * | Identify network servers and clients with a OS version related stringAndreas Huber2013-03-261-0/+3
* | | am d247aa8c: am 351f28e2: Merge "Load crypto plugins from additional shared l...Jeff Tinker2013-03-251-1/+1
|\ \ \ | |/ /
| * | Merge "Load crypto plugins from additional shared libraries" into jb-mr2-devJeff Tinker2013-03-251-1/+1
| |\ \ | | |/ | |/|
| | * Load crypto plugins from additional shared librariesJeff Tinker2013-03-221-1/+1
* | | am 489f73c6: am a97d15e2: Merge "ICameraServiceListener.h: Add STATUS_ENUMERA...Igor Murashkin2013-03-221-2/+21
|\ \ \ | |/ /
| * | Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-devIgor Murashkin2013-03-221-2/+21
| |\ \ | | |/ | |/|
| | * ICameraServiceListener.h: Add STATUS_ENUMERATING enumIgor Murashkin2013-03-211-2/+21
* | | am 6bc010e3: am 9e36b5a5: Merge "Add the presentation rotation support" into ...ztenghui2013-03-201-2/+12
|\ \ \ | |/ /
| * | Merge "Add the presentation rotation support" into jb-mr2-devztenghui2013-03-201-2/+12
| |\ \
| | * | Add the presentation rotation supportztenghui2013-03-151-2/+12
| | |/
* | | am 81c859d6: am de5cdcae: Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-202-0/+91
|\ \ \ | |/ /
| * | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-202-0/+91
| |\ \ | | |/ | |/|
| | * Implementing MediaDrm APIsJeff Tinker2013-03-132-0/+91
* | | am 858a2c70: am 7d02488e: Merge "Make limitations of MPEG4Writer explicit" in...Tenghui Zhu2013-03-141-0/+6
|\ \ \ | |/ /
| * | Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-devTenghui Zhu2013-03-141-0/+6
| |\ \
| | * | Make limitations of MPEG4Writer explicitJames Dong2013-03-141-0/+6
* | | | am 1be720b5: am a32fd0e2: Merge "remove uses of Surface in favor or IGraphicB...Mathias Agopian2013-03-147-14/+8
|\ \ \ \ | |/ / /
| * | | Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2...Mathias Agopian2013-03-137-14/+8
| |\ \ \ | | |_|/ | |/| |
| | * | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-127-14/+8
* | | | am a848cea9: am c148e7a6: Merge "Squashed commit of the following:" into jb-m...Andreas Huber2013-03-121-0/+3
|\ \ \ \ | |/ / /
| * | | Squashed commit of the following:Andreas Huber2013-03-121-0/+3
| |/ /
* | | am 993d462e: am fa4cf9d3: (Camera)ProCamera: Remove unused functions from bin...Igor Murashkin2013-03-114-44/+18
|\ \ \ | |/ /
| * | (Camera)ProCamera: Remove unused functions from binder interfaceIgor Murashkin2013-03-114-44/+18
| |/
* | Merge "Propose new interpretation for setPosition and setLoop"Glenn Kasten2013-03-091-13/+31
|\ \ | |/ |/|
| * Propose new interpretation for setPosition and setLoopGlenn Kasten2013-01-071-13/+31
* | Merge "Clean up the native code to match Java update" into jb-mr2-devztenghui2013-03-081-2/+17
|\ \
| * | Clean up the native code to match Java updateztenghui2013-03-081-2/+17
* | | Merge "Correct MediaCodec + Surface behavior" into jb-mr2-devAndy McFadden2013-03-062-0/+5
|\ \ \
| * | | Correct MediaCodec + Surface behaviorAndy McFadden2013-03-052-0/+5
* | | | Merge "Add template class SingleStateQueue" into jb-mr2-devGlenn Kasten2013-03-062-0/+132
|\ \ \ \ | |/ / / |/| | |
| * | | Add template class SingleStateQueueGlenn Kasten2013-03-052-0/+132
* | | | Merge "Implement Surface input to MediaCodec." into jb-mr2-devAndy McFadden2013-03-054-0/+65
|\ \ \ \ | |/ / / |/| | |
| * | | Implement Surface input to MediaCodec.Andy McFadden2013-03-044-0/+65
| |/ /