1. 4c68c68 Merge "DO NOT MERGE - audio policy: enable use of new AudioPolicyManager" into lmp-preview-dev by Eric Laurent · 11 years ago
  2. 16f093c Merge "DO NOT MERGE - audioflinger: test min HAL version instead of current" into lmp-preview-dev by Eric Laurent · 11 years ago
  3. 483f59a Move to dalvik.vm.lib.2 to force default to libart by Brian Carlstrom · 11 years ago
  4. e5cfbd5 DO NOT MERGE - audio policy: enable use of new AudioPolicyManager by Eric Laurent · 11 years ago
  5. d646190 DO NOT MERGE - audioflinger: test min HAL version instead of current by Eric Laurent · 11 years ago
  6. 47ed7df cameraservice: Fix ICameraDeviceUser aidl order. by Ruben Brunk · 11 years ago
  7. 24adc04 merge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb by The Android Automerger · 11 years ago
  8. 397e632 merge in master-release history after reset to cbc09e47a6cd9164219948caf848303ba19efbb9 by The Android Automerger · 11 years ago
  9. 77a3374 Merge "camera2: Update CameraService for HAL1 shim." by Ruben Brunk · 11 years ago
  10. cbc09e4 resolved conflicts for merge of 58c26d95 to master by Elliott Hughes · 11 years ago
  11. 58c26d9 am 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout." by Elliott Hughes · 11 years ago
  12. 9a59d41 am 85e6e87c: Merge "Restore accidentally-removed NULL timeout." by Elliott Hughes · 11 years ago
  13. e348c5b resolved conflicts for merge of c0bf836f to master by Elliott Hughes · 11 years ago
  14. 85e6e87 Merge "Restore accidentally-removed NULL timeout." by Elliott Hughes · 11 years ago
  15. 22f22ff Restore accidentally-removed NULL timeout. by Elliott Hughes · 11 years ago
  16. c0bf836 am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API." by Elliott Hughes · 11 years ago
  17. ad71caf am 3b6da6bf: Merge "Move frameworks/av off private API." by Elliott Hughes · 11 years ago
  18. 3b6da6b Merge "Move frameworks/av off private API." by Elliott Hughes · 11 years ago
  19. ee49929 Move frameworks/av off private API. by Elliott Hughes · 11 years ago
  20. b2119af camera2: Update CameraService for HAL1 shim. by Ruben Brunk · 11 years ago
  21. 9382378 resolved conflicts for merge of b1080917 to master by Elliott Hughes · 11 years ago
  22. b108091 am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3." by Elliott Hughes · 11 years ago
  23. d830622 Merge "audio policy: split audio policy library" by Eric Laurent · 11 years ago
  24. acbd949 am d084206d: Merge "Move frameworks/av off __futex_syscall3." by Elliott Hughes · 11 years ago
  25. d084206 Merge "Move frameworks/av off __futex_syscall3." by Elliott Hughes · 11 years ago
  26. 77e1512 Move frameworks/av off __futex_syscall3. by Elliott Hughes · 11 years ago
  27. 7ac0039 Merge "Remove the last of the references." by Marco Nelissen · 11 years ago
  28. 98c6be0 audio policy: split audio policy library by Eric Laurent · 11 years ago
  29. 0e03cf0 Remove the last of the references. by Marco Nelissen · 11 years ago
  30. 20f6c52 merge in master-release history after reset to 498692535c7ceecb3434a99c47e4c90ba3fdd90e by The Android Automerger · 11 years ago
  31. 4986925 Merge "audio policy: add new audio devices" by Eric Laurent · 11 years ago
  32. 2db93f3 Merge "Fix include" by Marco Nelissen · 11 years ago
  33. 43a28fb Fix include by Marco Nelissen · 11 years ago
  34. a857037 Merge "Use pointers instead of references because C" by Marco Nelissen · 11 years ago
  35. 34d632f Merge "Fix OGG recognition for 64 bit" by Andy Hung · 11 years ago
  36. 18a1b59 Use pointers instead of references because C by Marco Nelissen · 11 years ago
  37. 0516981 merge in master-release history after reset to 93c6fa7508cd0f5bb0ec80ea29ef8bfab4a6015f by The Android Automerger · 11 years ago
  38. 14ead78 Fix OGG recognition for 64 bit by Andy Hung · 11 years ago
  39. 93c6fa7 Merge "Add docs, releaseOutputBufferAtTime, seekTo." by Marco Nelissen · 11 years ago
  40. 00ddac6 Merge "Update AudioMixer::getTrackName to save channelMask" by Andy Hung · 11 years ago
  41. 1b77623 audio policy: add new audio devices by Eric Laurent · 11 years ago
  42. ddde219 Merge "Add HEVC decoder support to ACodec bug: 14571712" by Rachad · 11 years ago
  43. b4db73d Merge "Use new channel count functions for audio masks" by Andy Hung · 11 years ago
  44. 1e54e6d Merge "Pass stereo gains as packed minifloat" by Glenn Kasten · 11 years ago
  45. 79e2b62 Add docs, releaseOutputBufferAtTime, seekTo. by Marco Nelissen · 11 years ago
  46. c56f342 Pass stereo gains as packed minifloat by Glenn Kasten · 11 years ago
  47. 5859b98 am be2664da: am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode" by Eric Laurent · 11 years ago
  48. be2664d am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode" by Eric Laurent · 11 years ago
  49. 4c9bde7 am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode" by Eric Laurent · 11 years ago
  50. ce473c3 Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode" by Eric Laurent · 11 years ago
  51. 543864f merge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89 by The Android Automerger · 11 years ago
  52. e0ec9b9 merge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89 by The Android Automerger · 11 years ago
  53. a653eea merge in master-release history after reset to 272b7f26c300d2029f278cf2af523cf94e513b89 by The Android Automerger · 11 years ago
  54. 272b7f2 Fix warnings, re-enable -Werror. by Ruben Brunk · 11 years ago
  55. 22fcaca Fixbuild by Ruben Brunk · 11 years ago
  56. e507721 camera2: Adding TIFF writing utilities. by Ruben Brunk · 11 years ago
  57. 68112fc Update AudioMixer::getTrackName to save channelMask by Andy Hung · 11 years ago
  58. e541269 Use new channel count functions for audio masks by Andy Hung · 11 years ago
  59. c1a4e7c am 6b787cb8: am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning" by Andreas Huber · 11 years ago
  60. 6b787cb am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning" by Andreas Huber · 11 years ago
  61. 1b8b879 am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning" by Andreas Huber · 11 years ago
  62. 3059e27 Merge "libstagefright foundation: fix uninitialized varibale warning" by Andreas Huber · 11 years ago
  63. 7c96d53 Fix build. by Marco Nelissen · 11 years ago
  64. 5362ba0 Merge "Unify error/status codes" by Marco Nelissen · 11 years ago
  65. e419d7c Unify error/status codes by Marco Nelissen · 11 years ago
  66. 16a25c1 Merge "Hook up event handling in NDK MediaDrm API" by Jeff Tinker · 11 years ago
  67. 47aea1f ACodec: remove PTS log spam by Lajos Molnar · 11 years ago
  68. 3305b99 Hook up event handling in NDK MediaDrm API by Jeff Tinker · 11 years ago
  69. 10ba53b merge in master-release history after reset to d25b89d1e417082b7e4ee9db7c08ab8095d48d87 by The Android Automerger · 11 years ago
  70. 5d5f8a5 libstagefright foundation: fix uninitialized varibale warning by Amit Pundir · 11 years ago
  71. d25b89d Merge "Send 64 bit OMX codec handling to 32 bit MediaServer" by Andy Hung · 11 years ago
  72. f87e30f Send 64 bit OMX codec handling to 32 bit MediaServer by Andy Hung · 11 years ago
  73. 19a0c76 Merge "Update OMX messages for 64 bit" by Andy Hung · 11 years ago
  74. c389ca4 am 4b7c5444: am e32106fd: screenrecord: Add raw frames output format by Benoit Goby · 11 years ago
  75. 609b815 Update OMX messages for 64 bit by Andy Hung · 11 years ago
  76. 2472b1c Add HEVC decoder support to ACodec bug: 14571712 by Rachad · 11 years ago
  77. 3425fd5 Only export necessary symbols by Marco Nelissen · 11 years ago
  78. 7edda7a Merge "Fix typos and pointer math." by Marco Nelissen · 11 years ago
  79. 4b7c544 am e32106fd: screenrecord: Add raw frames output format by Benoit Goby · 11 years ago
  80. 5afbb74 Merge "WIP: MediaDrm NDK APIs" by Jeff Tinker · 11 years ago
  81. 829e097 Fix typos and pointer math. by Marco Nelissen · 11 years ago
  82. deb9081 Merge "Pull up mFlags and isFastTrack from Track to TrackBase" by Glenn Kasten · 11 years ago
  83. 1b87d8e merge in master-release history after reset to cbe6fddebe3ec84176037de7f9681d2407fa1113 by The Android Automerger · 11 years ago
  84. 497ca09 WIP: MediaDrm NDK APIs by Jeff Tinker · 11 years ago
  85. cbe6fdd Merge "Explicitly include Configuration.h" by Glenn Kasten · 11 years ago
  86. 2d859b9 Merge "Fix memory corruption if increaseSamplingN is not called" by Glenn Kasten · 11 years ago
  87. 56604aa Codec Offload: Add NULL check as mCallbackThread is NULL by Uday Gupta · 11 years ago
  88. e32106f screenrecord: Add raw frames output format by Benoit Goby · 11 years ago
  89. 050eb32 Some crypto stuff, error codes by Marco Nelissen · 11 years ago
  90. 755b0a6 Pull up mFlags and isFastTrack from Track to TrackBase by Glenn Kasten · 11 years ago
  91. 5b17c0b Explicitly include Configuration.h by Glenn Kasten · 11 years ago
  92. 9636984 Fix memory corruption if increaseSamplingN is not called by Glenn Kasten · 11 years ago
  93. 021cf96 AudioFlinger: add specific mutex for client lists by Eric Laurent · 11 years ago
  94. aa0315f Merge "Add AMediaCodec callback" by Marco Nelissen · 11 years ago
  95. 6c0bd23 merge in master-release history after reset to 99119b4564cea78be7a94d432dd8d8a3664615b7 by The Android Automerger · 11 years ago
  96. 99119b4 am 4ae3cfd8: (-s ours) am 21bde57f: Add frame dump output by Andy McFadden · 11 years ago
  97. cc177d2 am c1b0056e: (-s ours) am 2d11a203: Provide raw H.264 output from screenrecord by Andy McFadden · 11 years ago
  98. 4ae3cfd am 21bde57f: Add frame dump output by Andy McFadden · 11 years ago
  99. c1b0056 am 2d11a203: Provide raw H.264 output from screenrecord by Andy McFadden · 11 years ago
  100. 21bde57 Add frame dump output by Andy McFadden · 11 years ago