1. 6b33051 Merge "Make build warnings be errors" into nyc-dev by Glenn Kasten · 11 years ago
  2. 03e015d Merge "audio policy: fix getDeviceForStrategy()" into nyc-dev by Eric Laurent · 11 years ago
  3. 0f928fa audio policy: fix getDeviceForStrategy() by Eric Laurent · 11 years ago
  4. 5a89823 Merge "AudioTrackShared: fix min buffer size" into nyc-dev by Phil Burk · 11 years ago
  5. 7b5795d Fix OMX_IndexParamConsumerUsageBits size check am: 788b0b6 am: 63002af am: 8777bfb by Marco Nelissen · 11 years ago
  6. b7bd841 Fix OMX_IndexParamConsumerUsageBits size check am: 788b0b6 am: 63002af by Marco Nelissen · 11 years ago
  7. 8777bfb Fix OMX_IndexParamConsumerUsageBits size check am: 788b0b6 am: 63002af by Marco Nelissen · 11 years ago
  8. 63002af Fix OMX_IndexParamConsumerUsageBits size check am: 788b0b6 by Marco Nelissen · 11 years ago
  9. 8708e14 Merge "Camera: Fix openLegacy error codes" into nyc-dev by Eino-Ville Talvala · 11 years ago
  10. 788b0b6 Fix OMX_IndexParamConsumerUsageBits size check by Marco Nelissen · 11 years ago
  11. 311fab5 Merge "Fix build warnings" into nyc-dev by Glenn Kasten · 11 years ago
  12. 3525dd9 Camera: Fix openLegacy error codes by Eino-Ville Talvala · 11 years ago
  13. 26760d1 AudioTrackShared: fix min buffer size by Phil Burk · 11 years ago
  14. c42e9b4 Fix build warnings by Glenn Kasten · 11 years ago
  15. 2a0a707 resolve merge conflicts of 2830b01 to nyc-dev by Chien-Yu Chen · 11 years ago
  16. 2830b01 Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 am: e57ada1 am: d6e3220 am: e2049c7 am: edcd8f9 am: a4996d9 am: 30302ea am: f8fc3b7 by Chien-Yu Chen · 11 years ago
  17. a7706ab Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 am: e57ada1 am: d6e3220 am: e2049c7 am: edcd8f9 am: a4996d9 am: 30302ea by Chien-Yu Chen · 11 years ago
  18. f8fc3b7 Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 am: e57ada1 am: d6e3220 am: e2049c7 am: edcd8f9 am: a4996d9 by Chien-Yu Chen · 11 years ago
  19. 30302ea Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 am: e57ada1 am: d6e3220 am: e2049c7 am: edcd8f9 by Chien-Yu Chen · 11 years ago
  20. a4996d9 Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 am: e57ada1 am: d6e3220 am: e2049c7 by Chien-Yu Chen · 11 years ago
  21. edcd8f9 Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 am: e57ada1 am: d6e3220 by Chien-Yu Chen · 11 years ago
  22. e2049c7 Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 am: e57ada1 by Chien-Yu Chen · 11 years ago
  23. d6e3220 Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 am: e57ada1 by Chien-Yu Chen · 11 years ago
  24. e57ada1 Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 by Chien-Yu Chen · 11 years ago
  25. ac5ef62 Merge "Camera3Device: Validate template ID" into klp-dev by Chien-Yu Chen · 11 years ago
  26. 02c4f1c Merge "Fix typos in use of %#" into nyc-dev by Glenn Kasten · 11 years ago
  27. 6b1255b Fix typos in use of %# by Glenn Kasten · 11 years ago
  28. 7be6866 Merge "Fix build warnings" into nyc-dev by Glenn Kasten · 11 years ago
  29. 57c4e6f Fix build warnings by Glenn Kasten · 11 years ago
  30. 76f2713 Merge "Fix copy and paste error" into nyc-dev by Glenn Kasten · 11 years ago
  31. 1c65a1d Merge "Add systrace for normal read()" into nyc-dev by Glenn Kasten · 11 years ago
  32. c3418d0 Merge "audioflinger: clear mMixerBuffer if frame is not ready" into nyc-dev by Glenn Kasten · 11 years ago
  33. 947ffa3 audioflinger: clear mMixerBuffer if frame is not ready by Mohan Kumar · 12 years ago
  34. 1606b3f Merge "audio: allow standby for direct track" into nyc-dev by Eric Laurent · 11 years ago
  35. 9cd7ad1 audio: allow standby for direct track by vivek mehta · 11 years ago
  36. 32dc5a9 Merge "Camera2: Send ILLEGAL_ARGUMENT error for a bad stream configuration" into nyc-dev by Eino-Ville Talvala · 11 years ago
  37. 31c76d3 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 am: 192f85d -s ours am: 6c2dac8 am: 3d36f60 am: 58593db by Marco Nelissen · 11 years ago
  38. 7726b9f resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 am: 17b0060 am: af4637c by Marco Nelissen · 11 years ago
  39. 17ec7d7 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 am: 8e55cd3 by Marco Nelissen · 11 years ago
  40. e875c80 Make build warnings be errors by Glenn Kasten · 11 years ago
  41. a4f84d2 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 am: 192f85d -s ours am: 6c2dac8 am: 3d36f60 by Marco Nelissen · 11 years ago
  42. 7ac0d8f resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 am: 17b0060 by Marco Nelissen · 11 years ago
  43. 0ee25ef Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 by Marco Nelissen · 11 years ago
  44. 8a9b5bf Merge "Fix typo" into nyc-dev by Glenn Kasten · 11 years ago
  45. 58593db DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 am: 192f85d -s ours am: 6c2dac8 by Marco Nelissen · 11 years ago
  46. af4637c resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 by Marco Nelissen · 11 years ago
  47. 09def5e DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 am: c51bc92 am: 5df4326 by Marco Nelissen · 11 years ago
  48. 7836fa1 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 am: a9ba5e9 am: 22c973a by Marco Nelissen · 11 years ago
  49. ee0467a Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d am: 4f38da4 am: 81361a5 by Marco Nelissen · 11 years ago
  50. 9989e10 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 am: 8644100 am: c716312 by Marco Nelissen · 11 years ago
  51. 3d36f60 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 am: 192f85d -s ours by Marco Nelissen · 11 years ago
  52. 74e7dbd DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 am: 28d4ca0 am: caa1360 by Marco Nelissen · 11 years ago
  53. 17b0060 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours by Marco Nelissen · 11 years ago
  54. 8379b72 Fix copy and paste error by Glenn Kasten · 11 years ago
  55. 8e55cd3 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 by Marco Nelissen · 11 years ago
  56. 6c2dac8 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 am: e559250 by Marco Nelissen · 11 years ago
  57. 30a52a4 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 by Marco Nelissen · 11 years ago
  58. 562cf01 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 by Marco Nelissen · 11 years ago
  59. ec6a703 Add systrace for normal read() by Glenn Kasten · 11 years ago
  60. 68a43d3 Merge "Add VPX output buffer size check" into mnc-dev by Marco Nelissen · 11 years ago
  61. a070ba6 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 am: c51bc92 by Marco Nelissen · 11 years ago
  62. abb5726 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 am: a9ba5e9 by Marco Nelissen · 11 years ago
  63. 37090fa Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d am: 4f38da4 by Marco Nelissen · 11 years ago
  64. 8cbd657 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 am: 8644100 by Marco Nelissen · 11 years ago
  65. 78d00c9 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 am: 28d4ca0 by Marco Nelissen · 11 years ago
  66. 5df4326 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 by Marco Nelissen · 11 years ago
  67. 22c973a Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 by Marco Nelissen · 11 years ago
  68. 81361a5 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d by Marco Nelissen · 11 years ago
  69. c716312 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 by Marco Nelissen · 11 years ago
  70. caa1360 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 by Marco Nelissen · 11 years ago
  71. c51bc92 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours by Marco Nelissen · 11 years ago
  72. a9ba5e9 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours by Marco Nelissen · 11 years ago
  73. 4f38da4 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 by Marco Nelissen · 11 years ago
  74. 8644100 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours by Marco Nelissen · 11 years ago
  75. 28d4ca0 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours by Marco Nelissen · 11 years ago
  76. f19eec3 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee by Marco Nelissen · 11 years ago
  77. 3af5111 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af by Marco Nelissen · 11 years ago
  78. 30e2c0d Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 by Marco Nelissen · 11 years ago
  79. 1be8671 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 by Marco Nelissen · 11 years ago
  80. ccad831 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b by Marco Nelissen · 11 years ago
  81. cbdc988 Merge "stagefright: set pcm-encoding for raw audio tracks" into nyc-dev by Lajos Molnar · 11 years ago
  82. d40ea87 Merge "stagefright: account for alignment in MemoryDealer" into nyc-dev by Lajos Molnar · 11 years ago
  83. 26ae699 Fix typo by Glenn Kasten · 11 years ago
  84. ace8058 Camera2: Send ILLEGAL_ARGUMENT error for a bad stream configuration by Eino-Ville Talvala · 11 years ago
  85. 116a189 Camera3Device: Validate template ID by Chien-Yu Chen · 11 years ago
  86. 192f85d DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours am: 5103111 by Marco Nelissen · 11 years ago
  87. e559250 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours am: 726338d -s ours by Marco Nelissen · 11 years ago
  88. 099db66 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 by Marco Nelissen · 11 years ago
  89. 5103111 DO NOT MERGE Add VPX output buffer size check am: 1595f8a am: 5d44fff -s ours by Marco Nelissen · 11 years ago
  90. f79ccd5 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa by Marco Nelissen · 11 years ago
  91. 560a198 Merge "Update audio services for 64 bit compilation" into nyc-dev by Andy Hung · 11 years ago
  92. 77e43fa resolve merge conflicts of c66f8dd to lmp-mr1-dev by Marco Nelissen · 11 years ago
  93. 5ff52d6 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 by Marco Nelissen · 11 years ago
  94. 53af00c Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 by Marco Nelissen · 11 years ago
  95. df7dbf9 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c by Marco Nelissen · 11 years ago
  96. 0ab6ee3 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 by Marco Nelissen · 11 years ago
  97. 01c682b DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 by Marco Nelissen · 11 years ago
  98. e26d4ee DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours by Marco Nelissen · 11 years ago
  99. 89036af Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours by Marco Nelissen · 11 years ago
  100. 2828c06 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 by Marco Nelissen · 11 years ago