summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | am 4a0a02be: camera: Fix availableMaxDigitalZoom property to be floatIgor Murashkin2013-05-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am 00d08480: am a1a6f181: Merge "Various bug fixes to make ZSL work." into jb...Igor Murashkin2013-05-021-3/+34
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am a1a6f181: Merge "Various bug fixes to make ZSL work." into jb-mr2-devIgor Murashkin2013-05-021-3/+34
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am d1fc3808: am c53a7a79: Release the video frame buffer to fix the memory le...Jun Tian2013-05-022-2/+15
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am c53a7a79: Release the video frame buffer to fix the memory leak issue on e...Jun Tian2013-05-022-2/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | am e7914aad: am 7407f20a: goldfish: fix gralloc moduleAlex Ray2013-04-251-2/+1
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am 7407f20a: goldfish: fix gralloc moduleAlex Ray2013-04-251-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am 1e4fc668: am 57ac67ad: Camera3: Add asynchronous JPEGEino-Ville Talvala2013-04-176-84/+198
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 57ac67ad: Camera3: Add asynchronous JPEGEino-Ville Talvala2013-04-176-84/+198
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | am 689edf06: am 4e8dfb1f: Camera3: Add shutter notificationEino-Ville Talvala2013-04-164-3/+77
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 4e8dfb1f: Camera3: Add shutter notificationEino-Ville Talvala2013-04-164-3/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | am 46fa0743: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-150-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | am 036b3755: am 7c38b54b: Enforce READ_EXTERNAL_STORAGE on emulator.Jeff Sharkey2013-04-113-15/+12
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am 7c38b54b: Enforce READ_EXTERNAL_STORAGE on emulator.Jeff Sharkey2013-04-113-15/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | am 4f797848: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | am ad106cc0: am ccb311d2: Add liblogYing Wang2013-04-096-6/+8
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am ccb311d2: Add liblogYing Wang2013-04-096-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | am d7a77c97: am 899e8921: Camera: Handle AF state transitionsIgor Murashkin2013-04-081-3/+175
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am 899e8921: Camera: Handle AF state transitionsIgor Murashkin2013-04-081-3/+175
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | am b4f53471: am 199f6026: Camera3: Allow register_stream_buffers while reques...Igor Murashkin2013-04-081-1/+9
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 199f6026: Camera3: Allow register_stream_buffers while requests are in flightIgor Murashkin2013-04-081-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | am 0250c23e: am e0400c69: Camera3: Trigger IDs now received from frameworkIgor Murashkin2013-04-081-1/+46
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am e0400c69: Camera3: Trigger IDs now received from frameworkIgor Murashkin2013-04-081-1/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | am 13b51477: am 5e936df9: Camera2/3: Improve fake handshakeEino-Ville Talvala2013-04-082-4/+34
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am 5e936df9: Camera2/3: Improve fake handshakeEino-Ville Talvala2013-04-082-4/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | am d8bdc96f: am 03a28bba: Camera3: Support for still captureEino-Ville Talvala2013-04-084-48/+471
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am 03a28bba: Camera3: Support for still captureEino-Ville Talvala2013-04-084-48/+471
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 3ea24ef5: am 2de81ad1: Bare-bones emulated fake camera for HAL version 3Eino-Ville Talvala2013-04-089-27/+2088
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 2de81ad1: Bare-bones emulated fake camera for HAL version 3Eino-Ville Talvala2013-04-089-27/+2088
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 42d033d6: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7dda9999: am 4dc85efa: Camera: Hotplug support as if it was sysfsIgor Murashkin2013-03-2712-8/+695
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 4dc85efa: Camera: Hotplug support as if it was sysfsIgor Murashkin2013-03-2712-8/+695
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e96e51fb: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-200-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | goldfish: use fstab.goldfishcm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Nick Kralevich2013-08-132-2/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-24211-594/+56072
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-130-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-080-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-060-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-290-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-180-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-170-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | | | | | | | | |/| | | | | | | | | | | | | / / / | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-150-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | | | | | | | | | | |/| | | | | | | | | | | / / / | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-100-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | | | | | | |/| | | | | | | | | | | | |