1. d92e9a3 am df81a1aa: (-s ours) Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  2. 049828c Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  3. a00dfa7 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  4. 5ba6b98 am 843aba43: am 2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  5. cbf2b86 am 2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  6. 19caf26 Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  7. 245b812 am 4a4253b9: am 82edd543: Camera2: isSmoothZoomSupported should return FALSE by Igor Murashkin · 14 years ago
  8. a374b05 am 9ea63b3b: am 6f854608: Camera2: Set default flash mode to FLASH_OFF by Alex Ray · 14 years ago
  9. 78fe60c am 82edd543: Camera2: isSmoothZoomSupported should return FALSE by Igor Murashkin · 14 years ago
  10. be8d28a Camera2: Always disconnect in the client destructor by Igor Murashkin · 14 years ago
  11. 0ad293a Camera2: isSmoothZoomSupported should return FALSE by Igor Murashkin · 14 years ago
  12. 0a1832b am 6f854608: Camera2: Set default flash mode to FLASH_OFF by Alex Ray · 14 years ago
  13. 2814a4d Camera2: Set default flash mode to FLASH_OFF by Alex Ray · 14 years ago
  14. a476c9e am a761686d: am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev by Igor Murashkin · 14 years ago
  15. a290191 am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev by Igor Murashkin · 14 years ago
  16. 07cc78f Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev by Igor Murashkin · 14 years ago
  17. 30ae899 am c7ee4fda: am b8f0090a: Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  18. 8aad549 am b8f0090a: Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  19. 8ada0bf Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  20. cfdd842 Camera2: Fix Parameters#setZoom off by 1 validation error by Igor Murashkin · 14 years ago
  21. 00614a7 am 97f00a6b: am e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev by Igor Murashkin · 14 years ago
  22. ceea0c8 am e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev by Igor Murashkin · 14 years ago
  23. 193c13f Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev by Igor Murashkin · 14 years ago
  24. 9c54cca am 6f45866e: am c8823995: audioflinger/resampler: add build source for libaudio-resampler by ty.lee · 14 years ago
  25. 577e9cb am c8823995: audioflinger/resampler: add build source for libaudio-resampler by ty.lee · 14 years ago
  26. e049384 Camera2: On stopping preview, wait until captures are completed. by Eino-Ville Talvala · 14 years ago
  27. f4653ec merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  28. 2b5232d audioflinger/resampler: add build source for libaudio-resampler by ty.lee · 14 years ago
  29. 5b9c992 am 3576742a: am 4d410ede: Camera2: Fix off-by-one error in ZSL selection. by Eino-Ville Talvala · 14 years ago
  30. 196438b am 4d410ede: Camera2: Fix off-by-one error in ZSL selection. by Eino-Ville Talvala · 14 years ago
  31. f82fba4 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  32. 3d33019 Camera2: Fix off-by-one error in ZSL selection. by Eino-Ville Talvala · 14 years ago
  33. 056a76e am 4d85afad: am f6e09d20: Camera2: Unconditionally shut down streams on disconnect. by Eino-Ville Talvala · 14 years ago
  34. 6c8d48e am f6e09d20: Camera2: Unconditionally shut down streams on disconnect. by Eino-Ville Talvala · 14 years ago
  35. 572bf9a Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras by Igor Murashkin · 14 years ago
  36. 3dcdc3d Camera2: Unconditionally shut down streams on disconnect. by Eino-Ville Talvala · 14 years ago
  37. 6492545 am de434d89: am 7373cbe8: Camera2: Fix metering regions to take into account the current zoom/crop region by Igor Murashkin · 14 years ago
  38. b589f34 am 7373cbe8: Camera2: Fix metering regions to take into account the current zoom/crop region by Igor Murashkin · 14 years ago
  39. 3a6e453 Camera2: Fix metering regions to take into account the current zoom/crop region by Igor Murashkin · 14 years ago
  40. e8c46bc Camera2: Don't promote weak IBinder ptrs to strong ones by Igor Murashkin · 14 years ago
  41. 970fb1e am 9be4d65d: am af3d2887: Camera2: Change policy for calculating previewFpsRange from previewFps by Igor Murashkin · 14 years ago
  42. 4db789c am af3d2887: Camera2: Change policy for calculating previewFpsRange from previewFps by Igor Murashkin · 14 years ago
  43. 63dc199 Camera2: Change policy for calculating previewFpsRange from previewFps by Igor Murashkin · 14 years ago
  44. ccd9808 am 7ca6460d: am becb0bc4: Merge "Camera2: Don\'t promote weak IBinder ptrs to strong ones" into jb-mr1-dev by Igor Murashkin · 14 years ago
  45. 2c6f650 am becb0bc4: Merge "Camera2: Don\'t promote weak IBinder ptrs to strong ones" into jb-mr1-dev by Igor Murashkin · 14 years ago
  46. 0feea71 Merge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-dev by Igor Murashkin · 14 years ago
  47. cc1abea am e5f4024b: am 95069fef: Camera2: Use the triggerAfWithAuto quirk by Eino-Ville Talvala · 14 years ago
  48. 3b71688 am 577ac8a7: am 4865c526: Camera2: Synchronize mode changes and triggers by Eino-Ville Talvala · 14 years ago
  49. ee5293f am 95069fef: Camera2: Use the triggerAfWithAuto quirk by Eino-Ville Talvala · 14 years ago
  50. 7bdb77b am 4865c526: Camera2: Synchronize mode changes and triggers by Eino-Ville Talvala · 14 years ago
  51. 507994d Camera2: Don't promote weak IBinder ptrs to strong ones by Igor Murashkin · 14 years ago
  52. 8db937f am 6c9282d3: (-s ours) Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  53. bc77d3a Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  54. 4dca94e merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  55. ccf9540 Camera2: Fix deadlock while zooming during record by Igor Murashkin · 14 years ago
  56. 4bfc4a6 am e68eb9b8: am 9942f62d: Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  57. 61ebd5e am 9942f62d: Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  58. 4c84370 Camera2: Use the triggerAfWithAuto quirk by Eino-Ville Talvala · 14 years ago
  59. 4c9eb71 Camera2: Synchronize mode changes and triggers by Eino-Ville Talvala · 14 years ago
  60. 1daada3 Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  61. b6c9eeb am 650601ca: am 1f915a85: Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev by Andreas Huber · 14 years ago
  62. b75268d am 1f915a85: Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev by Andreas Huber · 14 years ago
  63. 6ec0f94 Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev by Andreas Huber · 14 years ago
  64. db30e68 Camera2: Include JPEG settings in ZSL requests. by Eino-Ville Talvala · 14 years ago
  65. 20a5a98 Optionally emit LPCM audio instead of using AAC in wifi display code by Andreas Huber · 14 years ago
  66. ea96735 resolved conflicts for merge of f12b1c81 to master by Glenn Kasten · 14 years ago
  67. 3dde166 am 7ffab293: Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev by Glenn Kasten · 14 years ago
  68. ef7fdc2 Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev by Glenn Kasten · 14 years ago
  69. 08102ee am d6e8c5b1: am f66cc52c: Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev by Igor Murashkin · 14 years ago
  70. 557f7dc am f66cc52c: Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev by Igor Murashkin · 14 years ago
  71. 5e8e66f Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev by Igor Murashkin · 14 years ago
  72. a6d4133 Integrate improved coefficient sinc resampler: VHQ by Glenn Kasten · 14 years ago
  73. 9f9d1ef am 0abee344: (-s ours) Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  74. 377d830 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  75. dee2bcd merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  76. e6267f5 am a9ba91a8: am d69fd4d2: Merge "Enable hdcp for WiFi display" into jb-mr1-dev by James Dong · 14 years ago
  77. 4df3123 am d69fd4d2: Merge "Enable hdcp for WiFi display" into jb-mr1-dev by James Dong · 14 years ago
  78. 95f24da Merge "Enable hdcp for WiFi display" into jb-mr1-dev by James Dong · 14 years ago
  79. 05dd06e Camera2: Fix deadlock while zooming during record by Igor Murashkin · 14 years ago
  80. 680f06a Camera2: Properly update FPS range when FPS is set. by Eino-Ville Talvala · 14 years ago
  81. e310a4c Drop video bitrate to 2.5mbps. by Dave Burke · 14 years ago
  82. f8a780a Better power savings with wifi display code. by Andreas Huber · 14 years ago
  83. bd57447 Increase polling frequency again temporarily to fix A/V issues by Andreas Huber · 14 years ago
  84. f3c7f03 am a9438d09: am ce953ce4: Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  85. d83c791 am ce953ce4: Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  86. b2e7a84 Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  87. 02b62d3 Camera2: Properly update FPS range when FPS is set. by Eino-Ville Talvala · 14 years ago
  88. acd6936 am b08633fc: am c2063056: Camera2: Fix prematurely clearing stream request by Alex Ray · 14 years ago
  89. f20b1f3 am c2063056: Camera2: Fix prematurely clearing stream request by Alex Ray · 14 years ago
  90. 744c170 am 7fd4e2a8: am b3e97b34: Camera2: Fix trying to release HAL stream twice by Igor Murashkin · 14 years ago
  91. 311f69f Camera2: Fix prematurely clearing stream request by Alex Ray · 14 years ago
  92. 6dfef0b am b3e97b34: Camera2: Fix trying to release HAL stream twice by Igor Murashkin · 14 years ago
  93. b30d9da Enable hdcp for WiFi display by James Dong · 14 years ago
  94. cce7ab7 am 5f49d702: am ecf17e82: Camera2: Handle client processes dying by closing camera resources by Igor Murashkin · 14 years ago
  95. b96540c am ecf17e82: Camera2: Handle client processes dying by closing camera resources by Igor Murashkin · 14 years ago
  96. a1e5dcc Camera2: Fix trying to release HAL stream twice by Igor Murashkin · 14 years ago
  97. b34304a am ad93604d: am 22d58d37: Camera2: Don\'t change state when reconnect is called by Igor Murashkin · 14 years ago
  98. 8dcdb95 Camera2: Handle client processes dying by closing camera resources by Igor Murashkin · 14 years ago
  99. 039a6da am 22d58d37: Camera2: Don\'t change state when reconnect is called by Igor Murashkin · 14 years ago
  100. 0cb290b Camera2: Don't change state when reconnect is called by Igor Murashkin · 14 years ago