1. c597031 am 6c839563: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  2. 3ac9bd7 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  3. a1970f4 merge in jb-mr1-factory-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  4. b01ba8f am 4c7b3129: am 2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  5. 0d19b57 am 2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  6. 739c59a merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  7. af5041c Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  8. fab610d am 1f9300d9: am 73125afc: Merge "Switch audio mode based on dongle\'s capabilities" into jb-mr1-dev by Andreas Huber · 14 years ago
  9. 9e52927 am 73125afc: Merge "Switch audio mode based on dongle\'s capabilities" into jb-mr1-dev by Andreas Huber · 14 years ago
  10. c6fbe60 Merge "Switch audio mode based on dongle's capabilities" into jb-mr1-dev by Andreas Huber · 14 years ago
  11. ff0ea51 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  12. 1fdfd01 Switch audio mode based on dongle's capabilities by Andreas Huber · 14 years ago
  13. 7b9aced merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  14. ffbbacb am 754cbdd2: am dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  15. 1f1bbbe am dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  16. a70995f Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  17. d230cc7 Camera: Clear Hardware device pointer when initialization fails by Igor Murashkin · 14 years ago
  18. efc04db am e4664bb0: am 3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev by Igor Murashkin · 14 years ago
  19. 975d3a7 am 3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev by Igor Murashkin · 14 years ago
  20. 9436ff8 Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev by Igor Murashkin · 14 years ago
  21. 4cc45fa Camera2: Fix uninitialized parameters. by Eino-Ville Talvala · 14 years ago
  22. 88c6afe am 240a538b: am d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  23. 52c903c am d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  24. c8d9bc2 Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  25. 1e908f4 am 80dfc5dc: am 350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev by Eric Laurent · 14 years ago
  26. 3db8b1f am 350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev by Eric Laurent · 14 years ago
  27. e069ec8 Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev by Eric Laurent · 14 years ago
  28. 5b44bee Camera2: Call onAutoFocus immediately for fixed-focus cameras by Igor Murashkin · 14 years ago
  29. d92e9a3 am df81a1aa: (-s ours) Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  30. 049828c Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  31. a00dfa7 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  32. 5ba6b98 am 843aba43: am 2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  33. cbf2b86 am 2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  34. 19caf26 Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  35. ad21da9 Camera2: Move non-ZSL shutter sound firing to be later. by Eino-Ville Talvala · 14 years ago
  36. 245b812 am 4a4253b9: am 82edd543: Camera2: isSmoothZoomSupported should return FALSE by Igor Murashkin · 14 years ago
  37. a374b05 am 9ea63b3b: am 6f854608: Camera2: Set default flash mode to FLASH_OFF by Alex Ray · 14 years ago
  38. 116bc97 audio policy: deprecate ro.camera.sound.forced by Eric Laurent · 14 years ago
  39. 78fe60c am 82edd543: Camera2: isSmoothZoomSupported should return FALSE by Igor Murashkin · 14 years ago
  40. be8d28a Camera2: Always disconnect in the client destructor by Igor Murashkin · 14 years ago
  41. 0ad293a Camera2: isSmoothZoomSupported should return FALSE by Igor Murashkin · 14 years ago
  42. 0a1832b am 6f854608: Camera2: Set default flash mode to FLASH_OFF by Alex Ray · 14 years ago
  43. 2814a4d Camera2: Set default flash mode to FLASH_OFF by Alex Ray · 14 years ago
  44. 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
  45. a290191 am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev by Igor Murashkin · 14 years ago
  46. 07cc78f Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev by Igor Murashkin · 14 years ago
  47. 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
  48. 8aad549 am b8f0090a: Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  49. 8ada0bf Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  50. cfdd842 Camera2: Fix Parameters#setZoom off by 1 validation error by Igor Murashkin · 14 years ago
  51. 00614a7 am 97f00a6b: am e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev by Igor Murashkin · 14 years ago
  52. ceea0c8 am e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev by Igor Murashkin · 14 years ago
  53. 193c13f Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev by Igor Murashkin · 14 years ago
  54. 9c54cca am 6f45866e: am c8823995: audioflinger/resampler: add build source for libaudio-resampler by ty.lee · 14 years ago
  55. 577e9cb am c8823995: audioflinger/resampler: add build source for libaudio-resampler by ty.lee · 14 years ago
  56. e049384 Camera2: On stopping preview, wait until captures are completed. by Eino-Ville Talvala · 14 years ago
  57. f4653ec merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  58. 2b5232d audioflinger/resampler: add build source for libaudio-resampler by ty.lee · 14 years ago
  59. 5b9c992 am 3576742a: am 4d410ede: Camera2: Fix off-by-one error in ZSL selection. by Eino-Ville Talvala · 14 years ago
  60. 196438b am 4d410ede: Camera2: Fix off-by-one error in ZSL selection. by Eino-Ville Talvala · 14 years ago
  61. f82fba4 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  62. 3d33019 Camera2: Fix off-by-one error in ZSL selection. by Eino-Ville Talvala · 14 years ago
  63. 056a76e am 4d85afad: am f6e09d20: Camera2: Unconditionally shut down streams on disconnect. by Eino-Ville Talvala · 14 years ago
  64. 6c8d48e am f6e09d20: Camera2: Unconditionally shut down streams on disconnect. by Eino-Ville Talvala · 14 years ago
  65. 572bf9a Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras by Igor Murashkin · 14 years ago
  66. 3dcdc3d Camera2: Unconditionally shut down streams on disconnect. by Eino-Ville Talvala · 14 years ago
  67. 6492545 am de434d89: am 7373cbe8: Camera2: Fix metering regions to take into account the current zoom/crop region by Igor Murashkin · 14 years ago
  68. b589f34 am 7373cbe8: Camera2: Fix metering regions to take into account the current zoom/crop region by Igor Murashkin · 14 years ago
  69. 3a6e453 Camera2: Fix metering regions to take into account the current zoom/crop region by Igor Murashkin · 14 years ago
  70. e8c46bc Camera2: Don't promote weak IBinder ptrs to strong ones by Igor Murashkin · 14 years ago
  71. 970fb1e am 9be4d65d: am af3d2887: Camera2: Change policy for calculating previewFpsRange from previewFps by Igor Murashkin · 14 years ago
  72. 4db789c am af3d2887: Camera2: Change policy for calculating previewFpsRange from previewFps by Igor Murashkin · 14 years ago
  73. 63dc199 Camera2: Change policy for calculating previewFpsRange from previewFps by Igor Murashkin · 14 years ago
  74. 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
  75. 2c6f650 am becb0bc4: Merge "Camera2: Don\'t promote weak IBinder ptrs to strong ones" into jb-mr1-dev by Igor Murashkin · 14 years ago
  76. 0feea71 Merge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-dev by Igor Murashkin · 14 years ago
  77. cc1abea am e5f4024b: am 95069fef: Camera2: Use the triggerAfWithAuto quirk by Eino-Ville Talvala · 14 years ago
  78. 3b71688 am 577ac8a7: am 4865c526: Camera2: Synchronize mode changes and triggers by Eino-Ville Talvala · 14 years ago
  79. ee5293f am 95069fef: Camera2: Use the triggerAfWithAuto quirk by Eino-Ville Talvala · 14 years ago
  80. 7bdb77b am 4865c526: Camera2: Synchronize mode changes and triggers by Eino-Ville Talvala · 14 years ago
  81. 507994d Camera2: Don't promote weak IBinder ptrs to strong ones by Igor Murashkin · 14 years ago
  82. 8db937f am 6c9282d3: (-s ours) Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  83. bc77d3a Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  84. 4dca94e merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  85. ccf9540 Camera2: Fix deadlock while zooming during record by Igor Murashkin · 14 years ago
  86. 4bfc4a6 am e68eb9b8: am 9942f62d: Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  87. 61ebd5e am 9942f62d: Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  88. 4c84370 Camera2: Use the triggerAfWithAuto quirk by Eino-Ville Talvala · 14 years ago
  89. 4c9eb71 Camera2: Synchronize mode changes and triggers by Eino-Ville Talvala · 14 years ago
  90. 1daada3 Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  91. 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
  92. 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
  93. 6ec0f94 Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev by Andreas Huber · 14 years ago
  94. db30e68 Camera2: Include JPEG settings in ZSL requests. by Eino-Ville Talvala · 14 years ago
  95. 20a5a98 Optionally emit LPCM audio instead of using AAC in wifi display code by Andreas Huber · 14 years ago
  96. ea96735 resolved conflicts for merge of f12b1c81 to master by Glenn Kasten · 14 years ago
  97. 3dde166 am 7ffab293: Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev by Glenn Kasten · 14 years ago
  98. ef7fdc2 Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev by Glenn Kasten · 14 years ago
  99. 08102ee am d6e8c5b1: am f66cc52c: Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev by Igor Murashkin · 14 years ago
  100. 557f7dc am f66cc52c: Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev by Igor Murashkin · 14 years ago