summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...staging/cm-12.0-cafThe Android Automerger2014-10-220-0/+0
|\
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-210-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-200-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-160-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-150-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-140-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-130-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-120-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-090-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-080-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-070-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-060-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-050-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-10-010-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-09-300-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-09-290-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-09-280-0/+0
| |\ |/ /
| * merge in lmp-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0f1a6...The Android Automerger2014-09-250-0/+0
| |\ |/ /
| * Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
| * merge in lmp-release history after reset to 2eed7ab0e5d81c0025737c6ce9931f3d8...The Android Automerger2014-09-240-0/+0
| |\
| | * Add error log to API1 CameraAgentAlan Newberger2014-09-231-0/+1
| | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-230-0/+0
| | |\
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-220-0/+0
| | | |\ | | |/ /
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-210-0/+0
| | | |\ | | |/ /
| | | * merge in lmp-release history after reset to 02d2429473b57bdfa1cb42610998d2893...The Android Automerger2014-09-210-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-200-0/+0
| | | | |\ | | | |/ / | | |/| / | | | |/
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-180-0/+0
| | | |\ | | |/ /
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-170-0/+0
| | | |\ | | |/ /
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-160-0/+0
| | | |\ | | |/ /
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-150-0/+0
| | | |\ | | |/ /
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-140-0/+0
| | | |\ | | |/ /
| | | * merge in lmp-release history after reset to bf08357f953252ad7a02c0e0c4b2bb879...The Android Automerger2014-09-130-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-130-0/+0
| | | | |\ | | | |/ / | | |/| / | | | |/
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-110-0/+0
| | | |\ | | |/ /
| | | * merge in lmp-release history after reset to 06b23bb5cbddfed587a6f0d7563673486...The Android Automerger2014-09-100-0/+0
| | | |\ | | |/ /
| | | * portability: Fix a bug where long AF callbacks caused ISE timeoutsIgor Murashkin2014-09-095-8/+144
| | | * Log null returns from Camera.getParametersAlan Newberger2014-09-090-0/+0
| | | * merge in lmp-release history after reset to ca507f86d3d5e4f16ebd666a2b42664e5...The Android Automerger2014-09-090-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to d5205c2648ba1213f28a232379d10b07a...The Android Automerger2014-09-080-0/+0
| | | | |\
| | | | | * merge in lmp-release history after reset to d5205c2648ba1213f28a232379d10b07a...The Android Automerger2014-09-070-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-release history after reset to fe02c862d3e608c0b158d6a7eb83c5c78...The Android Automerger2014-09-060-0/+0
| | | | | |\
| | | | | | * merge in lmp-release history after reset to d5205c2648ba1213f28a232379d10b07a...The Android Automerger2014-09-060-0/+0
| | | | | | |\ | | | | | |/ / | | | | |/| / | | | | | |/
| | | | | * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-09-040-0/+0
| | | | | |\
| | | | | | * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-09-030-0/+0
| | | | | | |\ | | | | | |/ /
| | | | | | * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-09-020-0/+0
| | | | | | |\ | | | | | |/ /
| | | | | | * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-09-010-0/+0
| | | | | | |\ | | | | | |/ /
| | | | | | * merge in lmp-release history after reset to 9fb7e16061ae2f3d3b059952706a1e1a1...The Android Automerger2014-08-310-0/+0
| | | | | | |\ | | | | | |/ /
| | | | | | * camera2-portability: Fix camera2 takePicture AE regressionSol Boucher2014-08-271-2/+7
| | | | | | * merge in lmp-release history after reset to 7c8d6957b96c75ce11f7373f4ab2451ee...The Android Automerger2014-08-270-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-release history after reset to f27e71f979e803a3ac00f4057eb909886...The Android Automerger2014-08-260-0/+0
| | | | | | | |\