1. b05c07d merge in master-release history after reset to 14136039b752376240698e8b422c76de01488bc5 by The Android Automerger · 11 years ago
  2. 1413603 Merge "Camera3: fix missing string in logging code" by Zhijun He · 11 years ago
  3. 13c878f Camera3: fix missing string in logging code by Zhijun He · 11 years ago
  4. 7ebe2c6 am 71171988: am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()" by Eric Laurent · 11 years ago
  5. 7117198 am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()" by Eric Laurent · 11 years ago
  6. f655acf am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()" by Eric Laurent · 11 years ago
  7. 8fb04d4 Merge "Fix memory leak when filtering commands in insertCommand_l()" by Eric Laurent · 11 years ago
  8. 6275b54 merge in master-release history after reset to dfa829c3ca81fcd2eecaabfff630ac0f41453731 by The Android Automerger · 11 years ago
  9. dfa829c Merge "Remove warnings in recordvideo" by Andy Hung · 11 years ago
  10. 0ae7801 Remove warnings in recordvideo by Andy Hung · 11 years ago
  11. ca40059 Merge "Fix audioloop test program" by Andy Hung · 11 years ago
  12. f4b0e60 Fix audioloop test program by Andy Hung · 11 years ago
  13. 91d8ec1 Merge "Don't build libmediandk for PDK" by Marco Nelissen · 11 years ago
  14. 83ae5be Don't build libmediandk for PDK by Marco Nelissen · 11 years ago
  15. 67c9437 Merge "WIP: MediaCodec and friends NDK APIs, plain C version" by Marco Nelissen · 11 years ago
  16. d8484dd Merge "Use audio_is_linear_pcm()" by Glenn Kasten · 11 years ago
  17. 0c3be87 WIP: MediaCodec and friends NDK APIs, plain C version by Marco Nelissen · 11 years ago
  18. f2776a5 Merge "camera3: Update CameraMetadata vendor tag handling." by Ruben Brunk · 11 years ago
  19. 6640d87 Merge "NULL check in ConnectPro" by Natalie Silvanovich · 11 years ago
  20. e1b55da NULL check in ConnectPro by Natalie Silvanovich · 11 years ago
  21. 93e1227 merge in master-release history after reset to fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9 by The Android Automerger · 11 years ago
  22. 5258138 merge in master-release history after reset to fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9 by The Android Automerger · 11 years ago
  23. b39f243 merge in master-release history after reset to fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9 by The Android Automerger · 11 years ago
  24. f81648e camera3: Update CameraMetadata vendor tag handling. by Ruben Brunk · 11 years ago
  25. fa366b2 Merge "Revert "camera3: Update CameraMetadata vendor tag handling."" by Ruben Brunk · 11 years ago
  26. 6770260 Revert "camera3: Update CameraMetadata vendor tag handling." by Ruben Brunk · 11 years ago
  27. 6c516d8 Merge "camera3: Update CameraMetadata vendor tag handling." by Ruben Brunk · 11 years ago
  28. 4764324 camera3: Update CameraMetadata vendor tag handling. by Ruben Brunk · 11 years ago
  29. 0a9aa4f Merge "Fix bug for direct track with PCM != 16-bit" by Glenn Kasten · 11 years ago
  30. c4b88a8 Fix bug for direct track with PCM != 16-bit by Glenn Kasten · 11 years ago
  31. ad3770a Merge "Camera3: Don't notifyError for non-fatal errors" by Zhijun He · 11 years ago
  32. 993fa06 Use audio_is_linear_pcm() by Glenn Kasten · 11 years ago
  33. 33a610c am 63249d6e: am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer" by Lajos Molnar · 11 years ago
  34. 344a1b9 am 113f2122: am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer" by Lajos Molnar · 11 years ago
  35. 63249d6 am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer" by Lajos Molnar · 11 years ago
  36. bc4bf53 am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer" by Lajos Molnar · 11 years ago
  37. 113f212 am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer" by Lajos Molnar · 11 years ago
  38. 5fa3f7a am b52675e9: Merge "Smooth out AwesomePlayer" by Lajos Molnar · 11 years ago
  39. b231408 Merge "AwesomePlayer: use PTS for queueBuffer" by Lajos Molnar · 11 years ago
  40. b52675e Merge "Smooth out AwesomePlayer" by Lajos Molnar · 11 years ago
  41. b021033 am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS" by Lajos Molnar · 11 years ago
  42. 192d6a5 am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator" by Lajos Molnar · 11 years ago
  43. 9e0922b am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS" by Lajos Molnar · 11 years ago
  44. edf6131 am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator" by Lajos Molnar · 11 years ago
  45. 6e76fda am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS" by Lajos Molnar · 11 years ago
  46. 075c8f6 am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator" by Lajos Molnar · 11 years ago
  47. f978226 Merge "AwesomePlayer: improve scheduling of video event to hit PTS" by Lajos Molnar · 11 years ago
  48. a69d6f5 Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator" by Lajos Molnar · 11 years ago
  49. b53fc4e resolved conflicts for merge of 47c888a9 to master by Glenn Kasten · 11 years ago
  50. 47c888a am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally" by Glenn Kasten · 11 years ago
  51. e580aa4 am 86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally" by Glenn Kasten · 11 years ago
  52. 8643838 Merge "When passing a size_t via binder, use 64-bits unconditionally" by Glenn Kasten · 11 years ago
  53. a6e6c70 AwesomePlayer: use PTS for queueBuffer by Lajos Molnar · 11 years ago
  54. 1b78c4b Smooth out AwesomePlayer by Lajos Molnar · 11 years ago
  55. 9747b68 AwesomePlayer: improve scheduling of video event to hit PTS by Lajos Molnar · 11 years ago
  56. aa8b569 stagefright: add ClockEstimator API and WindowedLinearFitEstimator by Lajos Molnar · 11 years ago
  57. 33ddcb6 Merge "Use AUDIO_INTERLEAVE_* constants" by Glenn Kasten · 11 years ago
  58. 8710fb4 am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include" by Glenn Kasten · 11 years ago
  59. f38e190 am 3d9164da: am 236f8ddd: Merge "Add missing include" by Glenn Kasten · 11 years ago
  60. 3d9164d am 236f8ddd: Merge "Add missing include" by Glenn Kasten · 11 years ago
  61. 236f8dd Merge "Add missing include" by Glenn Kasten · 11 years ago
  62. 8801418 am ee46bd37: am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace" by Lajos Molnar · 11 years ago
  63. ee46bd3 am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace" by Lajos Molnar · 11 years ago
  64. 2b0b701 am 0c388650: Merge "ACodec: add frame render/drop systrace" by Lajos Molnar · 11 years ago
  65. 0c38865 Merge "ACodec: add frame render/drop systrace" by Lajos Molnar · 11 years ago
  66. ee7a5ef am b4eacebf: am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam" by Glenn Kasten · 11 years ago
  67. b4eaceb am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam" by Glenn Kasten · 11 years ago
  68. 1afedc4 am 6eafba6b: Merge "Temporary workaround for log spam" by Glenn Kasten · 11 years ago
  69. 6eafba6 Merge "Temporary workaround for log spam" by Glenn Kasten · 11 years ago
  70. 83f052a Temporary workaround for log spam by Glenn Kasten · 11 years ago
  71. e11ae4b Camera3: Don't notifyError for non-fatal errors by Zhijun He · 11 years ago
  72. 29cb722 merge in master-release history after reset to c6b8225e759d1790d9a38082a18ce7e24a3dba27 by The Android Automerger · 11 years ago
  73. 877a0ac Use AUDIO_INTERLEAVE_* constants by Glenn Kasten · 11 years ago
  74. c6b8225 am 3c782246: am b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-bit only" by Glenn Kasten · 11 years ago
  75. 3c78224 am b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-bit only" by Glenn Kasten · 11 years ago
  76. b1d2b51 am 761636f3: Merge "Do not force all command-line apps to be 32-bit only" by Glenn Kasten · 11 years ago
  77. 761636f Merge "Do not force all command-line apps to be 32-bit only" by Glenn Kasten · 11 years ago
  78. d1adad7 resolved conflicts for merge of 0d79b935 to master by Glenn Kasten · 11 years ago
  79. 029a64e Define CHANNEL_MASK_* in terms of AUDIO_CHANNEL_OUT_* by Glenn Kasten · 11 years ago
  80. 6fbc1af ACodec: add frame render/drop systrace by Lajos Molnar · 11 years ago
  81. d2a29d0 Do not force all command-line apps to be 32-bit only by Glenn Kasten · 11 years ago
  82. 0d79b93 am b27ce2fb: am 416685d0: Merge "Fix format warnings" by Glenn Kasten · 11 years ago
  83. b27ce2f am 416685d0: Merge "Fix format warnings" by Glenn Kasten · 11 years ago
  84. 416685d Merge "Fix format warnings" by Glenn Kasten · 11 years ago
  85. 32fa3c6 Remove AUDIO_CHANNEL_OUT_SURROUND by Glenn Kasten · 11 years ago
  86. b9b1dd2 merge in master-release history after reset to 4799fa447c2c9681c0c51fa8151974a764679fdc by The Android Automerger · 11 years ago
  87. bff8046 am f612af07: am 1a7be1ec: Merge commit \'91820d46b5f3065c2fded3cdf65d305715b33bb1\' into HEAD by Bill Yi · 11 years ago
  88. f612af0 am 1a7be1ec: Merge commit \'91820d46b5f3065c2fded3cdf65d305715b33bb1\' into HEAD by Bill Yi · 11 years ago
  89. 1a7be1e Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD by Bill Yi · 11 years ago
  90. 4799fa4 Merge "Start pulling bits of FastMixer up to FastThread" by Glenn Kasten · 11 years ago
  91. 9b46d0e merge in master-release history after reset to c12ea1ce9b3ec44343892a5736923d77206782be by The Android Automerger · 11 years ago
  92. c12ea1c Merge "Camera3: scale the max jpeg buffer size based on resolutions" by Zhijun He · 11 years ago
  93. 0a352a1 resolved conflicts for merge of 6643b3d8 to master by Glenn Kasten · 11 years ago
  94. 6643b3d am f131f873: Merge "Add private method NBLog::Reader::dumpLine()" by Glenn Kasten · 11 years ago
  95. f131f87 Merge "Add private method NBLog::Reader::dumpLine()" by Glenn Kasten · 11 years ago
  96. 7aeb4b5 Merge "PlaylistFetcher: clear mTSParser on bad starting seq # hint" by Robert Shih · 11 years ago
  97. 95d287d Fix format warnings by Glenn Kasten · 11 years ago
  98. 92dfd8e Add private method NBLog::Reader::dumpLine() by Glenn Kasten · 12 years ago
  99. 2234002 Start pulling bits of FastMixer up to FastThread by Glenn Kasten · 11 years ago
  100. b3a11bc merge in master-release history after reset to 67ee990d324229ab0565ce632bd5a04297e16a01 by The Android Automerger · 11 years ago