summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 7158b670: Fix StaleDataExceptionsJay Shrauner2015-01-051-2/+9
|\
| * Fix StaleDataExceptionsJay Shrauner2014-12-191-2/+9
* | am 6765631b: Merge "Remove apache dependency from android-common."Narayan Kamath2014-12-153-3/+227
|\ \
| * \ Merge "Remove apache dependency from android-common."Narayan Kamath2014-12-153-3/+227
| |\ \
| | * | Remove apache dependency from android-common.Narayan Kamath2014-12-153-3/+227
| |/ /
* | | am 842e82f6: Merge "Move libvariablespeed to libc++."Dan Albert2014-11-162-6/+4
|\| |
| * | Merge "Move libvariablespeed to libc++."Dan Albert2014-11-162-6/+4
| |\ \
| | * | Move libvariablespeed to libc++.Dan Albert2014-11-152-6/+4
| |/ /
* | | am ede5a97a: Merge commit \'25b78c8a18327bd73c3d4d34887dd63953aeaa8c\' into l...Qiwen Zhao2014-11-121-5/+10
|\ \ \ | | |/ | |/|
| * | Merge commit '25b78c8a18327bd73c3d4d34887dd63953aeaa8c' into lmp-mr1-devQiwen Zhao2014-11-121-5/+10
| |\ \
| | * | Ensure default handler always is set if no other error handler registeredAlan Newberger2014-11-041-5/+10
* | | | am e7e528ac: Merge commit \'c15ddae4862bb9a10b0142fac9558a5f899b1a21\' into l...Qiwen Zhao2014-11-121-1/+17
|\| | |
| * | | Merge commit 'c15ddae4862bb9a10b0142fac9558a5f899b1a21' into lmp-mr1-devQiwen Zhao2014-11-121-1/+17
| |\| |
| | * | Ensure agent error handler is always non-nullAlan Newberger2014-10-271-1/+17
* | | | am 3238136a: Merge commit \'733ca8dfa76ac34d1f9caff8798d01a4a8f44002\' into l...Qiwen Zhao2014-11-124-15/+34
|\| | |
| * | | Merge commit '733ca8dfa76ac34d1f9caff8798d01a4a8f44002' into lmp-mr1-devQiwen Zhao2014-11-124-15/+34
| |\| |
| | * | Return more detailed debugging info for logging purposes.Senpo Hu2014-10-144-15/+34
* | | | am 7ce2ce7d: Merge commit \'318eeb225f4567a8c2a6fe14baa06e8923ebe622\' into l...Qiwen Zhao2014-11-125-83/+30
|\| | |
| * | | Merge commit '318eeb225f4567a8c2a6fe14baa06e8923ebe622' into lmp-mr1-devQiwen Zhao2014-11-125-83/+30
| |\| |
| | * | Cleanup: handle API 1 error callback in CameraExceptionHandler.Senpo Hu2014-10-105-83/+30
* | | | am a84d38ef: Merge commit \'2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f\' into l...Qiwen Zhao2014-11-120-0/+0
|\| | |
| * | | Merge commit '2d01b8e2b5ad30ce3c442799cad4c3d26607fc6f' into lmp-mr1-devQiwen Zhao2014-11-120-0/+0
| |\| |
| | * | Overhaul error handling in AndroidCameraAgentImpl.Senpo Hu2014-10-075-336/+653
* | | | am aacce208: Merge commit \'90e75d1f90b85e11f6905966ea28d59916935c68\' into l...Qiwen Zhao2014-11-121-1/+1
|\| | |
| * | | Merge commit '90e75d1f90b85e11f6905966ea28d59916935c68' into lmp-mr1-devQiwen Zhao2014-11-121-1/+1
| |\| |
| | * | Check isZoomSupported before any zoom ratio calculations.Alan Newberger2014-10-051-1/+1
* | | | am 52d378bc: Merge commit \'698997b9ef47f215350f03c0289f291846cd3604\' into l...Qiwen Zhao2014-11-121-3/+12
|\| | |
| * | | Merge commit '698997b9ef47f215350f03c0289f291846cd3604' into lmp-mr1-devQiwen Zhao2014-11-121-3/+12
| |\| |
| | * | Add null check for exif thumbnail sizePuneet Lall2014-10-031-3/+12
* | | | am a3d310ed: Merge commit \'1c1d1afb5701b78fcdf09969bba1c20eb591bccf\' into l...Qiwen Zhao2014-11-122-11/+15
|\| | |
| * | | Merge commit '1c1d1afb5701b78fcdf09969bba1c20eb591bccf' into lmp-mr1-devQiwen Zhao2014-11-122-11/+15
| |\| |
| | * | Remove default thumbnail size setting in portability libAlan Newberger2014-09-292-11/+15
* | | | am 21e5d240: am 70a82d9d: Add null check in AndroidCameraSettings.Senpo Hu2014-10-270-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | am 70a82d9d: Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
| |\ \ \ | | | |/ | | |/|
* | | | am 0ea96753: am 2eed7ab0: Merge "Specify Locale.US for stringification of enu...Alan Newberger2014-10-270-0/+0
|\| | |
| * | | am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-devAlan Newberger2014-09-231-3/+4
| |\ \ \
* | | | | am 5f6b2905: am bad9708b: Add error log to API1 CameraAgentAlan Newberger2014-10-270-0/+0
|\| | | |
| * | | | am bad9708b: Add error log to API1 CameraAgentAlan Newberger2014-09-231-0/+1
| |\ \ \ \
* | \ \ \ \ am 2f525107: Overhaul error handling in AndroidCameraAgentImpl.Senpo Hu2014-10-245-336/+653
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Overhaul error handling in AndroidCameraAgentImpl.Senpo Hu2014-10-245-336/+653
| | |_|_|/ | |/| | |
* | | | | am 70a82d9d: Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
|\| | | |
| * | | | Add null check in AndroidCameraSettings.Senpo Hu2014-09-241-0/+8
| | |_|/ | |/| |
* | | | am 2eed7ab0: Merge "Specify Locale.US for stringification of enums" into lmp-devAlan Newberger2014-09-231-3/+4
|\| | |
| * | | Merge "Specify Locale.US for stringification of enums" into lmp-devAlan Newberger2014-09-231-3/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Specify Locale.US for stringification of enumsAlan Newberger2014-09-221-3/+4
* | | | am bad9708b: Add error log to API1 CameraAgentAlan Newberger2014-09-231-0/+1
|\| | | | |_|/ |/| |
| * | Add error log to API1 CameraAgentAlan Newberger2014-09-221-0/+1
| |/
* | am c8e9c014: Merge "Clean up makefile cruft."Dan Albert2014-09-121-3/+2
|\ \
| * \ Merge "Clean up makefile cruft."Dan Albert2014-09-121-3/+2
| |\ \
| | * | Clean up makefile cruft.Dan Albert2014-09-111-3/+2
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 22:59:33 +0000