1. b53fc4e resolved conflicts for merge of 47c888a9 to master by Glenn Kasten · 12 years ago
  2. 47c888a am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally" by Glenn Kasten · 12 years ago
  3. e580aa4 am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally" by Glenn Kasten · 12 years ago
  4. 8643838 Merge "When passing a size_t via binder, use 64-bits unconditionally" by Glenn Kasten · 12 years ago
  5. 33ddcb6 Merge "Use AUDIO_INTERLEAVE_* constants" by Glenn Kasten · 12 years ago
  6. 8710fb4 am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include" by Glenn Kasten · 12 years ago
  7. f38e190 am 3d9164da: am 236f8ddd: Merge "Add missing include" by Glenn Kasten · 12 years ago
  8. 3d9164d am 236f8ddd: Merge "Add missing include" by Glenn Kasten · 12 years ago
  9. 236f8dd Merge "Add missing include" by Glenn Kasten · 12 years ago
  10. 8801418 am ee46bd37: am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace" by Lajos Molnar · 12 years ago
  11. ee46bd3 am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace" by Lajos Molnar · 12 years ago
  12. 2b0b701 am 0c388650: Merge "ACodec: add frame render/drop systrace" by Lajos Molnar · 12 years ago
  13. 0c38865 Merge "ACodec: add frame render/drop systrace" by Lajos Molnar · 12 years ago
  14. ee7a5ef am b4eacebf: am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam" by Glenn Kasten · 12 years ago
  15. b4eaceb am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam" by Glenn Kasten · 12 years ago
  16. 1afedc4 am 6eafba6b: Merge "Temporary workaround for log spam" by Glenn Kasten · 12 years ago
  17. 6eafba6 Merge "Temporary workaround for log spam" by Glenn Kasten · 12 years ago
  18. 83f052a Temporary workaround for log spam by Glenn Kasten · 12 years ago
  19. 877a0ac Use AUDIO_INTERLEAVE_* constants by Glenn Kasten · 12 years ago
  20. c6b8225 am 3c782246: am b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-bit only" by Glenn Kasten · 12 years ago
  21. 3c78224 am b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-bit only" by Glenn Kasten · 12 years ago
  22. b1d2b51 am 761636f3: Merge "Do not force all command-line apps to be 32-bit only" by Glenn Kasten · 12 years ago
  23. 761636f Merge "Do not force all command-line apps to be 32-bit only" by Glenn Kasten · 12 years ago
  24. d1adad7 resolved conflicts for merge of 0d79b935 to master by Glenn Kasten · 12 years ago
  25. 029a64e Define CHANNEL_MASK_* in terms of AUDIO_CHANNEL_OUT_* by Glenn Kasten · 12 years ago
  26. 6fbc1af ACodec: add frame render/drop systrace by Lajos Molnar · 12 years ago
  27. d2a29d0 Do not force all command-line apps to be 32-bit only by Glenn Kasten · 12 years ago
  28. 0d79b93 am b27ce2fb: am 416685d0: Merge "Fix format warnings" by Glenn Kasten · 12 years ago
  29. b27ce2f am 416685d0: Merge "Fix format warnings" by Glenn Kasten · 12 years ago
  30. 416685d Merge "Fix format warnings" by Glenn Kasten · 12 years ago
  31. 32fa3c6 Remove AUDIO_CHANNEL_OUT_SURROUND by Glenn Kasten · 12 years ago
  32. bff8046 am f612af07: am 1a7be1ec: Merge commit \'91820d46b5f3065c2fded3cdf65d305715b33bb1\' into HEAD by Bill Yi · 12 years ago
  33. f612af0 am 1a7be1ec: Merge commit \'91820d46b5f3065c2fded3cdf65d305715b33bb1\' into HEAD by Bill Yi · 12 years ago
  34. 1a7be1e Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD by Bill Yi · 12 years ago
  35. 4799fa4 Merge "Start pulling bits of FastMixer up to FastThread" by Glenn Kasten · 12 years ago
  36. c12ea1c Merge "Camera3: scale the max jpeg buffer size based on resolutions" by Zhijun He · 12 years ago
  37. 0a352a1 resolved conflicts for merge of 6643b3d8 to master by Glenn Kasten · 12 years ago
  38. 6643b3d am f131f873: Merge "Add private method NBLog::Reader::dumpLine()" by Glenn Kasten · 12 years ago
  39. f131f87 Merge "Add private method NBLog::Reader::dumpLine()" by Glenn Kasten · 12 years ago
  40. 7aeb4b5 Merge "PlaylistFetcher: clear mTSParser on bad starting seq # hint" by Robert Shih · 12 years ago
  41. 95d287d Fix format warnings by Glenn Kasten · 12 years ago
  42. 92dfd8e Add private method NBLog::Reader::dumpLine() by Glenn Kasten · 13 years ago
  43. 2234002 Start pulling bits of FastMixer up to FastThread by Glenn Kasten · 12 years ago
  44. f7da096 Camera3: scale the max jpeg buffer size based on resolutions by Zhijun He · 12 years ago
  45. 5cda1b3 PlaylistFetcher: clear mTSParser on bad starting seq # hint by Robert Shih · 12 years ago
  46. 15387a6 AwesomePlayer: fixed division by zero in onBufferingUpdate by Robert Shih · 12 years ago
  47. 67ee990 Merge "Support VP8 encoder key frame interval and number of temporal layers configuration." by Alex Glaznev · 12 years ago
  48. 4154795 Support VP8 encoder key frame interval and number of by Alex Glaznev · 12 years ago
  49. e273141 am 7e5c6351: am 4513aa2c: Merge "AArch64: rewrite audioflinger\'s sinc resample by intrinsics." by Glenn Kasten · 12 years ago
  50. 7e5c635 am 4513aa2c: Merge "AArch64: rewrite audioflinger\'s sinc resample by intrinsics." by Glenn Kasten · 12 years ago
  51. 4513aa2 Merge "AArch64: rewrite audioflinger's sinc resample by intrinsics." by Glenn Kasten · 12 years ago
  52. 66036d5 Merge "camera3: Don't hold mLock during flush call" by Zhijun He · 12 years ago
  53. 3ccf3c1 Merge "Removed libvideoeditor" by Lajos Molnar · 12 years ago
  54. 7ef2039 camera3: Don't hold mLock during flush call by Zhijun He · 12 years ago
  55. c8555d0 Removed libvideoeditor by Lajos Molnar · 12 years ago
  56. e7ec24c Merge "CameraService: fix waitUntilIdle bug revealed by TestingCamera2." by Jianing Wei · 12 years ago
  57. 106b83d am dae621c2: am 95006625: Merge "camera: set mNeedConfig after creating ZSL stream" by Eino-Ville Talvala · 12 years ago
  58. 18e846c am 474038ae: am 27158eb5: Merge "AArch64: AString::append for longs and pointers" by Nick Kralevich · 12 years ago
  59. dae621c am 95006625: Merge "camera: set mNeedConfig after creating ZSL stream" by Eino-Ville Talvala · 12 years ago
  60. 474038a am 27158eb5: Merge "AArch64: AString::append for longs and pointers" by Nick Kralevich · 12 years ago
  61. 9500662 Merge "camera: set mNeedConfig after creating ZSL stream" by Eino-Ville Talvala · 12 years ago
  62. 27158eb Merge "AArch64: AString::append for longs and pointers" by Nick Kralevich · 12 years ago
  63. 3c76fa3 CameraService: fix waitUntilIdle bug revealed by TestingCamera2. by Jianing Wei · 12 years ago
  64. 9e8eeaf Merge "BufferQueue: Increase max slots from 32 to 64" by Dan Stoza · 12 years ago
  65. 6adc9cc Camera3: block until get an available buffer by Zhijun He · 12 years ago
  66. cb010a3 am e1ff1051: am e0f20cea: Merge "libeffects: 64 bit compile issues" by Mark Salyzyn · 12 years ago
  67. e1ff105 am e0f20cea: Merge "libeffects: 64 bit compile issues" by Mark Salyzyn · 12 years ago
  68. e0f20ce Merge "libeffects: 64 bit compile issues" by Mark Salyzyn · 12 years ago
  69. 7cb0e73 libeffects: 64 bit compile issues by Mark Salyzyn · 12 years ago
  70. 77d4f61 Merge "CameraService: fix race condition and wrong last frame number." by Jianing Wei · 12 years ago
  71. 2d6bb3f CameraService: fix race condition and wrong last frame number. by Jianing Wei · 12 years ago
  72. ce65a05 am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled" by Mark Salyzyn · 12 years ago
  73. 1b24cf3 am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d by Mark Salyzyn · 12 years ago
  74. 4845b69 am d4a3cae8: am 1df2557a: Merge "Remove code markers" by Dmitriy Ivanov · 12 years ago
  75. f5f2400 am cd4eb72e: Merge "media: -Werror re-enabled" by Mark Salyzyn · 12 years ago
  76. e80631a am 839d11d1: Merge changes I0a744dc7,Id993a70d by Mark Salyzyn · 12 years ago
  77. cd4eb72e Merge "media: -Werror re-enabled" by Mark Salyzyn · 12 years ago
  78. 839d11d Merge changes I0a744dc7,Id993a70d by Mark Salyzyn · 12 years ago
  79. 3ab368e media: use size_t for integer iterator to Vector::size() by Mark Salyzyn · 12 years ago
  80. 3d90809 am 6bb7a891: am 432ed3d6: Merge "libstagefright: fix 64-bit warnings" by Mark Salyzyn · 12 years ago
  81. db43b34 media: 64 bit compile issues by Mark Salyzyn · 12 years ago
  82. d4a3cae am 1df2557a: Merge "Remove code markers" by Dmitriy Ivanov · 12 years ago
  83. 1df2557 Merge "Remove code markers" by Dmitriy Ivanov · 12 years ago
  84. cd1e05b Remove code markers by Dmitriy Ivanov · 12 years ago
  85. 3b5ec66 media: -Werror re-enabled by Mark Salyzyn · 12 years ago
  86. f0948bc Merge "Camera: don't dereference timestamp if it is missing" by Zhijun He · 12 years ago
  87. 6bb7a89 am 432ed3d6: Merge "libstagefright: fix 64-bit warnings" by Mark Salyzyn · 12 years ago
  88. 432ed3d Merge "libstagefright: fix 64-bit warnings" by Mark Salyzyn · 12 years ago
  89. e5e3d08 camera: set mNeedConfig after creating ZSL stream by Yuvraj Pasi · 12 years ago
  90. ef80764 AArch64: AString::append for longs and pointers by Marcus Oakland · 12 years ago
  91. 6056bdd Camera: don't dereference timestamp if it is missing by Zhijun He · 12 years ago
  92. 96b0d5e Merge "Improve resampler filter computation speed" by Andy Hung · 12 years ago
  93. f6d0c1f libstagefright: fix 64-bit warnings by Colin Cross · 12 years ago
  94. 17ca014 Merge "audioflinger: forward device change to effects in direct thread" by Glenn Kasten · 12 years ago
  95. 210810b am 29fe1ea4: am 9829344d: Merge "media: memset sizeof argument issues" by Mark Salyzyn · 12 years ago
  96. 29fe1ea am 9829344d: Merge "media: memset sizeof argument issues" by Mark Salyzyn · 12 years ago
  97. 9829344 Merge "media: memset sizeof argument issues" by Mark Salyzyn · 12 years ago
  98. c125f38 audioflinger: forward device change to effects in direct thread by Glenn Kasten · 12 years ago
  99. 27a1710 Merge "Update test-resample to handle multichannel" by Andy Hung · 12 years ago
  100. 2475264 BufferQueue: Increase max slots from 32 to 64 by Dan Stoza · 12 years ago