1. e1a2df5 Resolve conflict by The Android Open Source Project · 12 years ago
  2. bcf093b Merge "Fix definining of ANDROID_SMP." by Ian Rogers · 12 years ago
  3. 2be7786 Fix definining of ANDROID_SMP. by Ian Rogers · 12 years ago
  4. 841daeb am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP initor;" by Mike Lockwood · 12 years ago
  5. 686a0c4 Merge "MTP Device: Parse USB3 descriptor for MTP initor;" by Mike Lockwood · 12 years ago
  6. e2a168b am d5923409: mediaplayer: limit scheduling video frames into the future by Lajos Molnar · 12 years ago
  7. f5176d8 am eecb7805: NuPlayer: set anchor time for each audio buffer. by Ronghua Wu · 12 years ago
  8. d592340 mediaplayer: limit scheduling video frames into the future by Lajos Molnar · 12 years ago
  9. eecb780 NuPlayer: set anchor time for each audio buffer. by Ronghua Wu · 12 years ago
  10. 9cf809c am ac302143: Fix the fix by Marco Nelissen · 12 years ago
  11. ac30214 Fix the fix by Marco Nelissen · 12 years ago
  12. 7ae605a am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-dev by Marco Nelissen · 12 years ago
  13. 22bc10a Merge "Clear effect buffer before sending to chain" into lmp-dev by Marco Nelissen · 12 years ago
  14. 57088b5 Clear effect buffer before sending to chain by Marco Nelissen · 12 years ago
  15. 81fb2e8 am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev by Andy Hung · 12 years ago
  16. e9234f1 Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev by Andy Hung · 12 years ago
  17. c2813e5 Fix AudioTrack retrograde getPosition when restoring tracks by Andy Hung · 12 years ago
  18. bd94706 Merge "move audio sink open/close to NuPlayerRenderer" into lmp-dev by Chong Zhang · 12 years ago
  19. 0ebf65b Merge "move audio sink open/close to NuPlayerRenderer" into lmp-dev by Chong Zhang · 12 years ago
  20. 3b9eb1f move audio sink open/close to NuPlayerRenderer by Chong Zhang · 12 years ago
  21. 5eebc4b am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level." by Chih-Hung Hsieh · 12 years ago
  22. 8a8f2fd am 589a89f5: Merge "Add -no-integrated-as at local level." by Chih-Hung Hsieh · 12 years ago
  23. 589a89f Merge "Add -no-integrated-as at local level." by Chih-Hung Hsieh · 12 years ago
  24. 81a6119 am c40da54b: Merge "Fix freed memory references" into lmp-dev by Lajos Molnar · 12 years ago
  25. c40da54 Merge "Fix freed memory references" into lmp-dev by Lajos Molnar · 12 years ago
  26. 6b8feee Add -no-integrated-as at local level. by Chih-Hung Hsieh · 12 years ago
  27. cd4dd3a am 4b21635d: am b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE" by Chris Elliott · 12 years ago
  28. 4b21635 am b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE" by Chris Elliott · 12 years ago
  29. 942481e Fix freed memory references by Marco Nelissen · 12 years ago
  30. b6dcdbf Revert "audio: prevent larger than required sleeps - DO NOT MERGE" by Chris Elliott · 12 years ago
  31. e9bf7a5 am a2d4a6da: audio policy: Fix for voice call audio loss by Haynes Mathew George · 12 years ago
  32. 8265ba0 am 05c0d7d7: am 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE by Chris Elliott · 12 years ago
  33. a2d4a6d audio policy: Fix for voice call audio loss by Haynes Mathew George · 12 years ago
  34. 05c0d7d am 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE by Chris Elliott · 12 years ago
  35. 620208d audio: prevent larger than required sleeps - DO NOT MERGE by Chris Elliott · 12 years ago
  36. 0b1133a am 54599682: am 2feb18dd: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE" by Chris Elliott · 12 years ago
  37. 5459968 am 2feb18dd: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE" by Chris Elliott · 12 years ago
  38. 2feb18d Revert "audio: prevent larger than required sleeps - DO NOT MERGE" by Chris Elliott · 12 years ago
  39. eb018ce am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev by Zhijun He · 12 years ago
  40. 9d2189f Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev by Zhijun He · 12 years ago
  41. c77956d am 95740336: am 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE by Haynes Mathew George · 12 years ago
  42. 9574033 am 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE by Haynes Mathew George · 12 years ago
  43. 96ff5c4 Camera2Client: avoid two consecutive sets of configure_streams calls by Zhijun He · 12 years ago
  44. 8c0417c audio: prevent larger than required sleeps - DO NOT MERGE by Haynes Mathew George · 12 years ago
  45. 260bca4 am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-dev by Lajos Molnar · 12 years ago
  46. 2201314 am 1375ac6d: Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-dev by Lajos Molnar · 12 years ago
  47. 447898b Merge "ACodec: only check crop rect on output port" into lmp-dev by Lajos Molnar · 12 years ago
  48. 4fed5e4 resolved conflicts for merge of 2edda09a to lmp-dev-plus-aosp by Lajos Molnar · 12 years ago
  49. 5a2d817 am 512e9792: stagefright: support passing GraphicBuffer in metadata buffer by Lajos Molnar · 12 years ago
  50. 1375ac6 Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-dev by Lajos Molnar · 12 years ago
  51. 2edda09 stagefright: fix surface input handling of software encoders by Lajos Molnar · 12 years ago
  52. 512e979 stagefright: support passing GraphicBuffer in metadata buffer by Lajos Molnar · 12 years ago
  53. a73d9e0 NuPlayer: query current position from NuPlayerRenderer. by Ronghua Wu · 12 years ago
  54. fc4ba7c am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev by Wei Jia · 12 years ago
  55. ff11166 am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev by Chong Zhang · 12 years ago
  56. e760de6 Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev by Wei Jia · 12 years ago
  57. dab70a0 NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state. by Wei Jia · 12 years ago
  58. 801a3ff Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev by Chong Zhang · 12 years ago
  59. 319898b am 7225187b: Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev by Wei Jia · 12 years ago
  60. 7225187 Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev by Wei Jia · 12 years ago
  61. 10d023b handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat by Chong Zhang · 12 years ago
  62. 935c97a am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev by Guang Zhu · 12 years ago
  63. 380757b Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev by Guang Zhu · 12 years ago
  64. 667623a Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" by Guang Zhu · 12 years ago
  65. 013f7ee am 9286354c: Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev by Dave Burke · 12 years ago
  66. 9286354 Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev by Dave Burke · 12 years ago
  67. f2ab219 Revert "audio policy: add support for ro.audio.media_deep_buffer" by Vineeta Srivastava · 12 years ago
  68. f393c33 ACodec: process deferred messages when entering Loaded state. by Wei Jia · 12 years ago
  69. 4c40353 am ffd5cdbd: Merge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-dev by Eric Laurent · 12 years ago
  70. ffd5cdb Merge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-dev by Eric Laurent · 12 years ago
  71. 95511ad audio policy: add support for ro.audio.media_deep_buffer by Eric Laurent · 12 years ago
  72. a0041d6 am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev by Chong Zhang · 12 years ago
  73. aec1dbf Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev by Chong Zhang · 12 years ago
  74. e20685f am f5ada6ed: audio policy: move intializations to onFirstRef() by Eric Laurent · 12 years ago
  75. f5ada6e audio policy: move intializations to onFirstRef() by Eric Laurent · 12 years ago
  76. 367272c am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev by Lajos Molnar · 12 years ago
  77. 9c78328 handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat by Chong Zhang · 12 years ago
  78. a4c3d8f Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev by Lajos Molnar · 12 years ago
  79. dc111e8 am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." into lmp-dev by Wei Jia · 12 years ago
  80. 185a295 Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." into lmp-dev by Wei Jia · 12 years ago
  81. 6e029f0 MediaCodec: fix onError and onInputBufferAvailable by Lajos Molnar · 12 years ago
  82. f2ec103 am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev by Marco Nelissen · 12 years ago
  83. af23838 Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev by Marco Nelissen · 12 years ago
  84. 49966ff NuPlayerRenderer: adjust anchor time correctly for video only case. by Wei Jia · 12 years ago
  85. 0490686 Fix VideoFrame class layout for 64/32 bit by Marco Nelissen · 12 years ago
  86. 91a3cc0 ACodec: only check crop rect on output port by Lajos Molnar · 12 years ago
  87. 60dd0b8 am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev by Eric Laurent · 12 years ago
  88. ce26e9d Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev by Eric Laurent · 12 years ago
  89. 375c025 am ac4d8b31: am 6ade0417: Merge "Remove dead code." by Chih-Hung Hsieh · 12 years ago
  90. 7985dcb AudioTrack: fix AudioTrackThread crash upon exit by Eric Laurent · 12 years ago
  91. ac4d8b3 am 6ade0417: Merge "Remove dead code." by Chih-Hung Hsieh · 12 years ago
  92. 6ade041 Merge "Remove dead code." by Chih-Hung Hsieh · 12 years ago
  93. f4a4c1d Remove dead code. by Chih-Hung Hsieh · 12 years ago
  94. 5bed747 am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-dev by Eric Laurent · 12 years ago
  95. 95222a1 am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" into lmp-dev by Eric Laurent · 12 years ago
  96. 58b67a4 am 73d0a798: Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-dev by Andy Hung · 12 years ago
  97. baf1ce1 am 5002d02e: Merge "Recover from errors" into lmp-dev by Marco Nelissen · 12 years ago
  98. 0781178 Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-dev by Eric Laurent · 12 years ago
  99. 5bee844 Merge "audio policy: fix lockup during mediaserver restart" into lmp-dev by Eric Laurent · 12 years ago
  100. 73d0a79 Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-dev by Andy Hung · 12 years ago