1. 30ca800 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  2. 1352352 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  3. dd6b47e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  4. b4a0680 Camera3: Fix the deadlock during recording pinch zooming by Zhijun He · 12 years ago
  5. 22a5ddb am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev by Zhijun He · 12 years ago
  6. 6f6b31d Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev by Zhijun He · 12 years ago
  7. 14e585c am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev by Ed Heyl · 12 years ago
  8. f8f370b camera3: Disable ZSL for limited mode camera HALs by Igor Murashkin · 12 years ago
  9. 6947f12 Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev by Ed Heyl · 12 years ago
  10. b662e33 camera3: Fix zsl buffers released-while-in-use race condition by Igor Murashkin · 12 years ago
  11. 059161b camera3: Disable ZSL for limited mode camera HALs by Igor Murashkin · 12 years ago
  12. 9b89c15 am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev by Igor Murashkin · 12 years ago
  13. ca3fb12 Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev by Igor Murashkin · 12 years ago
  14. 124ccf4 Camera3: Fix the deadlock during recording pinch zooming by Zhijun He · 12 years ago
  15. 98730cd am 1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev by Igor Murashkin · 12 years ago
  16. 1f7f83b Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev by Igor Murashkin · 12 years ago
  17. a842a2a Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  18. fead4f1 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  19. efb0fd2 camera3: Fix zsl buffers released-while-in-use race condition by Igor Murashkin · 12 years ago
  20. b7337d5 am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev by Igor Murashkin · 12 years ago
  21. ed49d7b Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev by Igor Murashkin · 12 years ago
  22. 1d60db8 am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp by Mansoor Aftab · 12 years ago
  23. c2c874d Camera3: Fix Bug minTimestamp is never greater than frame timestamp by Mansoor Aftab · 12 years ago
  24. 82db9e6 camera3: Fix recording failure when switching resolutions while preview on by Igor Murashkin · 12 years ago
  25. 4345d5b Camera3: Make sure new metadata results signal other threads waiting by Igor Murashkin · 12 years ago
  26. cf2148e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  27. f3bddaf merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  28. 5bbca46 Avoid a deadlock during EmptyBufferDone by Andreas Huber · 12 years ago
  29. 9545b67 am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev by Jamie Gennis · 12 years ago
  30. f21daf4 Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev by Jamie Gennis · 12 years ago
  31. 722e489 am 01831d23: Camera2/3: Increase digital zoom steps by Zhijun He · 12 years ago
  32. 1b4ca5c Avoid a deadlock during EmptyBufferDone by Andreas Huber · 12 years ago
  33. 01831d2 Camera2/3: Increase digital zoom steps by Zhijun He · 12 years ago
  34. d763063 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  35. a01f72d merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  36. 81972da Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  37. 074eb38 am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev by Mathias Agopian · 12 years ago
  38. e2dfa5a Merge "update to Fence::waitForever() API change" into jb-mr2-dev by Mathias Agopian · 12 years ago
  39. b07d3c4 am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev by Andy McFadden · 12 years ago
  40. 4224ded Merge "Adjust timestamp scale" into jb-mr2-dev by Andy McFadden · 12 years ago
  41. d764424 update to Fence::waitForever() API change by Mathias Agopian · 12 years ago
  42. b5b2d03 am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness by Chong Zhang · 12 years ago
  43. a7f316e Reconcile with AOSP by Jean-Baptiste Queru · 12 years ago
  44. 324143b Adjust timestamp scale by Andy McFadden · 12 years ago
  45. 99f27cd wifi-display: retry UDP read/write to improve connection robustness by Chong Zhang · 12 years ago
  46. eaf4216 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  47. affd710 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  48. c3e155a Merge branch 'jb-mr2-dev' into jb-mr2-dev-plus-aosp by Conley Owens · 12 years ago
  49. dd90e8b Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev by Conley Owens · 12 years ago
  50. eef0aa7 am 7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  51. 0d0d868 Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  52. 9f51d98 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  53. 03b7bdd am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev by Chong Zhang · 12 years ago
  54. ceac5fb Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev by Chong Zhang · 12 years ago
  55. a1f70e6 am 083a08ac: Camera: don\'t spam RingBufferConsumer logs in eng builds by Igor Murashkin · 12 years ago
  56. d5694a2 Camera3: Fix fast flexible YUV->NV21 path. by Eino-Ville Talvala · 12 years ago
  57. 8e2afd9 Camera: don't spam RingBufferConsumer logs in eng builds by Igor Murashkin · 12 years ago
  58. e974c7d am effc08ed: Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC" by Elliott Hughes · 12 years ago
  59. effc08e Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC" by Elliott Hughes · 12 years ago
  60. d60867b Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC" by Elliott Hughes · 12 years ago
  61. 8df7184 Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC by Glenn Kasten · 12 years ago
  62. 4a434ce Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC by Glenn Kasten · 12 years ago
  63. 2d9c5cf merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  64. 76d1490 am c650e6ab: am 72c324ef: Empty test commit for AOSP by Conley Owens · 12 years ago
  65. a2d2dc6 am 72c324ef: Empty test commit for AOSP by Conley Owens · 12 years ago
  66. ffcce83 am be03b28f: Merge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev by Igor Murashkin · 12 years ago
  67. f5fe919 am 375379a4: Merge "Fix unreleased mutex in ToneGenerator stopTone()" into jb-mr2-dev by Eric Laurent · 12 years ago
  68. 4ceea25 Merge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev by Igor Murashkin · 12 years ago
  69. 72c324e Empty test commit for AOSP by Conley Owens · 12 years ago
  70. c7731ac Merge "Fix unreleased mutex in ToneGenerator stopTone()" into jb-mr2-dev by Eric Laurent · 12 years ago
  71. f79feab merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  72. 5282713 Camera: Pause preview when needing to delete jpeg/zsl streams by Igor Murashkin · 12 years ago
  73. 1f9d411 am 38ea629e: Merge "Camera3: Refactor stream code to be DRY" into jb-mr2-dev by Igor Murashkin · 12 years ago
  74. 8dbaa56 Merge "Camera3: Refactor stream code to be DRY" into jb-mr2-dev by Igor Murashkin · 12 years ago
  75. 1e27c22 Fix unreleased mutex in ToneGenerator stopTone() by Eric Laurent · 12 years ago
  76. 4f5f9c1 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  77. 3573574 wifi-display: misc fixes for M3 response parsing by Chong Zhang · 12 years ago
  78. 11bffe7 am 0d24eb5e: Merge "Don\'t purge effects we\'re about to start using" into jb-mr2-dev by Marco Nelissen · 12 years ago
  79. d702ba1 am 519f7624: Merge "Don\'t render buffers that have size 0" into jb-mr2-dev by Marco Nelissen · 12 years ago
  80. e743d2e Merge "Don't purge effects we're about to start using" into jb-mr2-dev by Marco Nelissen · 12 years ago
  81. 033988d Merge "Don't render buffers that have size 0" into jb-mr2-dev by Marco Nelissen · 12 years ago
  82. 72f57bc am 1d74d78f: Merge "Camera2/3: Optimize a few YCbCr_420_888 copy paths" into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  83. 5fd5b26 Merge "Camera2/3: Optimize a few YCbCr_420_888 copy paths" into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  84. bd4d0b6 am da5405fb: Merge "Camera2: FoV quirk crop regions" into jb-mr2-dev by Alex Ray · 12 years ago
  85. 6d0cf90 Merge "Camera2: FoV quirk crop regions" into jb-mr2-dev by Alex Ray · 12 years ago
  86. e3a9f96 Camera3: Refactor stream code to be DRY by Igor Murashkin · 12 years ago
  87. 091ad0f am 747b8492: Camera3: Fix initial orientation configuration. by Eino-Ville Talvala · 12 years ago
  88. 1a90a78 Camera3: Fix initial orientation configuration. by Eino-Ville Talvala · 12 years ago
  89. 8bdb01c Don't purge effects we're about to start using by Marco Nelissen · 12 years ago
  90. b6ac8e2 Don't render buffers that have size 0 by Marco Nelissen · 12 years ago
  91. 2703cf1 Camera3: Fix initial orientation configuration. by Eino-Ville Talvala · 12 years ago
  92. fcbf94b Camera2/3: Optimize a few YCbCr_420_888 copy paths by Eino-Ville Talvala · 12 years ago
  93. 56eea85 am e464e15a: Merge "camera3: Manage fences properly when buffers are returned with an error" into jb-mr2-dev by Igor Murashkin · 12 years ago
  94. a646516 am 7fe6ac0d: Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev by Igor Murashkin · 12 years ago
  95. 9d75e99 Merge "camera3: Manage fences properly when buffers are returned with an error" into jb-mr2-dev by Igor Murashkin · 12 years ago
  96. 714e392 Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev by Igor Murashkin · 12 years ago
  97. bf1b905 am 19cb41fb: Merge "Camera3: Support flexible YUV for preview callbacks" into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  98. 8513c5e Merge "Camera3: Support flexible YUV for preview callbacks" into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  99. 5a1798a camera3: Manage fences properly when buffers are returned with an error by Igor Murashkin · 12 years ago
  100. fac0b80 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago