1. 3670ef9 Merge "Re-add MTP interface string" am: 58cdf4a1ac am: b804854648 am: 7e8b1663fc by Jerry Zhang · 9 years ago
  2. ff9f01d Merge "Re-add MTP interface string" am: 58cdf4a1ac am: b804854648 am: 7e8b1663fc by Jerry Zhang · 9 years ago
  3. 7e8b166 Merge "Re-add MTP interface string" am: 58cdf4a1ac am: b804854648 by Jerry Zhang · 9 years ago
  4. b804854 Merge "Re-add MTP interface string" am: 58cdf4a1ac by Jerry Zhang · 9 years ago
  5. 58cdf4a1 Merge "Re-add MTP interface string" by Jerry Zhang · 9 years ago
  6. 6a79052 Re-add MTP interface string by Jerry Zhang · 9 years ago
  7. e396e1c Merge "Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc am: b9dd2f3074 am: 3ebb5e39b5 am: 96e0201e7e" into nyc-mr2-dev-plus-aosp by Marco Nelissen · 9 years ago
  8. 9c06656 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc am: b9dd2f3074 am: 3ebb5e39b5 am: 96e0201e7e by Marco Nelissen · 9 years ago
  9. d4c9270 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc am: b9dd2f3074 am: 3ebb5e39b5 am: 94837c19a1 by Marco Nelissen · 9 years ago
  10. 17682ea Merge "Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc am: b9dd2f3074 am: 3ebb5e39b5 am: 96e0201e7e" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  11. e7265b7 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc am: b9dd2f3074 am: 3ebb5e39b5 by Marco Nelissen · 9 years ago
  12. ea83760 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc am: b9dd2f3074 am: 3ebb5e39b5 by Marco Nelissen · 9 years ago
  13. 94837c1 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc am: b9dd2f3074 by Marco Nelissen · 9 years ago
  14. 96e0201 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc am: b9dd2f3074 by Marco Nelissen · 9 years ago
  15. 3ebb5e3 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc by Marco Nelissen · 9 years ago
  16. b9dd2f3 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b by Marco Nelissen · 9 years ago
  17. 56cf3b0 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours by Marco Nelissen · 9 years ago
  18. 41dab9b Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 by Marco Nelissen · 9 years ago
  19. 13ff5b0 Merge "mediaplayer: add buffering settings API" by TreeHugger Robot · 9 years ago
  20. fb34642 Merge "media: Use width and height when dispWidth and dispHeight are not present." by TreeHugger Robot · 9 years ago
  21. 04a4572 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e by Marco Nelissen · 9 years ago
  22. a2c05e0 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 by Marco Nelissen · 9 years ago
  23. 5a62595 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 by Marco Nelissen · 9 years ago
  24. 81341d9 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 by Marco Nelissen · 9 years ago
  25. 7e5936e Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf by Marco Nelissen · 9 years ago
  26. a5333c0 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 by Marco Nelissen · 9 years ago
  27. 8474c51 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e by Marco Nelissen · 9 years ago
  28. 59ed2db Merge "libaudiohal: Fix handling of NULL replySize param to Effect::command" by TreeHugger Robot · 9 years ago
  29. dc6f340 mediaplayer: add buffering settings API by Wei Jia · 9 years ago
  30. 0a4db60 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e by Marco Nelissen · 9 years ago
  31. acb7186 Don't CHECK when buffer is too large am: c2f0c73bfc by Marco Nelissen · 9 years ago
  32. bcd0a04 libaudiohal: Fix handling of NULL replySize param to Effect::command by Mikhail Naganov · 9 years ago
  33. a72ef28 Merge "Clean up Fence a little." by Brian C. Anderson · 9 years ago
  34. 334d7a0 resolve merge conflicts of 1038297e29 to nyc-mr2-dev am: 009ed8002d by Marco Nelissen · 9 years ago
  35. 8086328 resolve merge conflicts of 1038297e29 to nyc-mr2-dev am: 009ed8002d by Marco Nelissen · 9 years ago
  36. c62b65f Merge "Remove DRMExtractor" by Marco Nelissen · 9 years ago
  37. eadba76 resolve merge conflicts of 1038297e29 to nyc-mr1-dev-plus-aosp am: 6bf40ddf1c by Marco Nelissen · 9 years ago
  38. fadac24 resolve merge conflicts of 1038297e29 to nyc-mr1-dev-plus-aosp am: 6bf40ddf1c by Marco Nelissen · 9 years ago
  39. 9bb03b4 Merge "audioflinger: Fix effect creation handling" by TreeHugger Robot · 9 years ago
  40. 009ed80 resolve merge conflicts of 1038297e29 to nyc-mr2-dev by Marco Nelissen · 9 years ago
  41. 6bf40dd resolve merge conflicts of 1038297e29 to nyc-mr1-dev-plus-aosp by Marco Nelissen · 9 years ago
  42. 2872c7a Merge "BufferingSettings: hook up internal BufferingSettings API." by Wei Jia · 9 years ago
  43. 1038297 Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 am: a59dca6634 am: 5cc0712ce0 am: 835c7ec015 am: c0b4ce0047 by Marco Nelissen · 9 years ago
  44. c3773d1 Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 am: a59dca6634 am: 5cc0712ce0 am: 835c7ec015 by Marco Nelissen · 9 years ago
  45. c0b4ce0 Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 am: a59dca6634 am: 5cc0712ce0 by Marco Nelissen · 9 years ago
  46. 835c7ec Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 am: a59dca6634 by Marco Nelissen · 9 years ago
  47. 5cc0712 Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 by Marco Nelissen · 9 years ago
  48. a59dca6 Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 by Marco Nelissen · 9 years ago
  49. c3ea68a Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc by Marco Nelissen · 9 years ago
  50. 25a057e Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 by Marco Nelissen · 9 years ago
  51. 902d8e9 Don't initialize sync sample parameters until the end am: a9660fe122 by Marco Nelissen · 9 years ago
  52. 2238699 Don't initialize sync sample parameters until the end am: a9660fe122 by Marco Nelissen · 9 years ago
  53. 7e95f0e Merge "Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours am: 46c00e467d -s ours am: 310cc83920 -s ours" into nyc-mr2-dev-plus-aosp by Eric Laurent · 9 years ago
  54. 7b2d520 Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours am: 46c00e467d -s ours am: 310cc83920 -s ours by Eric Laurent · 9 years ago
  55. a115372 Merge "Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours am: 46c00e467d -s ours am: cb0e14f856 -s ours" into nyc-mr2-dev-plus-aosp by Eric Laurent · 9 years ago
  56. 54bb582 Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours am: 46c00e467d -s ours am: cb0e14f856 -s ours by Eric Laurent · 9 years ago
  57. 77aed4c Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours am: b5d31fca16 -s ours am: e6bb1bdd21 -s ours am: d7848ce659 -s ours am: 9a20310d58 -s ours" into nyc-mr2-dev-plus-aosp by Eric Laurent · 9 years ago
  58. 5c4eeed DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours am: b5d31fca16 -s ours am: e6bb1bdd21 -s ours am: d7848ce659 -s ours am: 9a20310d58 -s ours by Eric Laurent · 9 years ago
  59. a3911f8 DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours am: b5d31fca16 -s ours am: e6bb1bdd21 -s ours am: d7848ce659 -s ours am: 057d2213e2 -s ours by Eric Laurent · 9 years ago
  60. c23f85d Merge "Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours am: 46c00e467d -s ours am: 310cc83920 -s ours" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  61. 04ec7e7 Merge "Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours am: 46c00e467d -s ours am: cb0e14f856 -s ours" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  62. b17539d Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours am: 46c00e467d -s ours by Eric Laurent · 9 years ago
  63. 6041b5f Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours am: 46c00e467d -s ours by Eric Laurent · 9 years ago
  64. 7105878 Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours am: b5d31fca16 -s ours am: e6bb1bdd21 -s ours am: d7848ce659 -s ours am: 9a20310d58 -s ours" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  65. 866db36 DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours am: b5d31fca16 -s ours am: e6bb1bdd21 -s ours am: d7848ce659 -s ours by Eric Laurent · 9 years ago
  66. 33b5792 DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours am: b5d31fca16 -s ours am: e6bb1bdd21 -s ours am: d7848ce659 -s ours by Eric Laurent · 9 years ago
  67. 310cc83 Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours by Eric Laurent · 9 years ago
  68. cb0e14f Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours am: 6483838270 -s ours by Eric Laurent · 9 years ago
  69. 9a20310 DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours am: b5d31fca16 -s ours am: e6bb1bdd21 -s ours by Eric Laurent · 9 years ago
  70. 057d221 DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours am: b5d31fca16 -s ours am: e6bb1bdd21 -s ours by Eric Laurent · 9 years ago
  71. 46c00e4 Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours am: 1d2f93208d -s ours by Eric Laurent · 9 years ago
  72. d7848ce DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours am: b5d31fca16 -s ours by Eric Laurent · 9 years ago
  73. 6483838 Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6 -s ours by Eric Laurent · 9 years ago
  74. e6bb1bd DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae -s ours by Eric Laurent · 9 years ago
  75. 1d2f932 Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev by Eric Laurent · 9 years ago
  76. b5d31fc DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety by Eric Laurent · 9 years ago
  77. 5ab2dba Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev by Eric Laurent · 9 years ago
  78. 1ec283e Merge "oboeservice: headers for service interface" by Phil Burk · 9 years ago
  79. 4453f45 Remove DRMExtractor by Marco Nelissen · 9 years ago
  80. 2247f7b audioflinger: Fix effect creation handling by Mikhail Naganov · 9 years ago
  81. 35f537f Merge "stagefright: add rangeOffset to OMXBuffer" by TreeHugger Robot · 9 years ago
  82. f95fa33 Merge "Oboe FIFO: general purpose FIFO" by TreeHugger Robot · 9 years ago
  83. a9660fe Don't initialize sync sample parameters until the end by Marco Nelissen · 9 years ago
  84. c2f0c73 Don't CHECK when buffer is too large by Marco Nelissen · 9 years ago
  85. 8c48184 Merge "AudioFlinger: Move RecordBufferConverter to libaudioprocessing" by Andy Hung · 9 years ago
  86. 060a6c5 Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39 am: c6d07e8230 am: 15b18326b6 by Mark Salyzyn · 9 years ago
  87. 49b2b4d stagefright: add rangeOffset to OMXBuffer by Chong Zhang · 9 years ago
  88. 49d3b5e Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39 am: c6d07e8230 by Mark Salyzyn · 9 years ago
  89. 15b1832 Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39 am: c6d07e8230 by Mark Salyzyn · 9 years ago
  90. c6d07e8 Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39 by Mark Salyzyn · 9 years ago
  91. 59cfe7d Merge "liblog: use log/log.h for ALOG macros" by Mark Salyzyn · 9 years ago
  92. d825ab9 Merge "Fix issues crashing with Fatal signal when calling getFormat" am: 1808b0e3e4 am: 93b375b781 am: 4fdfda5cd2 by qinzhichao · 9 years ago
  93. 2c47cd2 Merge "Fix issues crashing with Fatal signal when calling getFormat" am: 1808b0e3e4 am: 93b375b781 by qinzhichao · 9 years ago
  94. 4fdfda5 Merge "Fix issues crashing with Fatal signal when calling getFormat" am: 1808b0e3e4 by qinzhichao · 9 years ago
  95. fd911c1 Oboe FIFO: general purpose FIFO by Phil Burk · 9 years ago
  96. 93b375b Merge "Fix issues crashing with Fatal signal when calling getFormat" by qinzhichao · 9 years ago
  97. 828bea5 oboeservice: headers for service interface by Phil Burk · 9 years ago
  98. 1808b0e Merge "Fix issues crashing with Fatal signal when calling getFormat" by Treehugger Robot · 9 years ago
  99. e74bbf1 liblog: use log/log.h for ALOG macros by Mark Salyzyn · 9 years ago
  100. 467743d media: Use width and height when dispWidth and dispHeight are not present. by Hangyu Kuang · 9 years ago