1. e5143d6 am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 13 years ago
  2. a74774f am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 13 years ago
  3. 4d8f6a3 Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 13 years ago
  4. 3ab6ccd am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 13 years ago
  5. b32af64 am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 13 years ago
  6. d4dee1a am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 13 years ago
  7. b7f0d82 am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 13 years ago
  8. 89bac18 am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 13 years ago
  9. 16db83c am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 13 years ago
  10. 80ef174 am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 13 years ago
  11. 68e37da am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 13 years ago
  12. 8840991 Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 13 years ago
  13. eb07c53 Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 13 years ago
  14. c06c360 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 13 years ago
  15. 55f115a Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 13 years ago
  16. f139965 am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 13 years ago
  17. 3edba93 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 13 years ago
  18. 98fcc40 Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 13 years ago
  19. 21fc9ad stagefright amrwbenc: Remove a duplicate, unused file by Martin Storsjo · 13 years ago
  20. 842679b stagefright: Only use __int64 on MSVC, not on all win32 compilers by Martin Storsjo · 13 years ago
  21. a9de2b5 stagefright aacenc: Make the mem_malloc function 64-bit safe by Martin Storsjo · 14 years ago
  22. 5c8247f stagefright: Include stdlib.h for malloc/free by Martin Storsjo · 14 years ago
  23. 15e9d47 am 88748e6d: am d86302df: Quiet the log. by Dianne Hackborn · 13 years ago
  24. 88748e6 am d86302df: Quiet the log. by Dianne Hackborn · 13 years ago
  25. d86302d Quiet the log. by Dianne Hackborn · 13 years ago
  26. dc03da0 am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 by James Dong · 13 years ago
  27. e668c0b am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" by Conley Owens · 13 years ago
  28. 644f36e am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" by Conley Owens · 13 years ago
  29. 2488a94 am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 by James Dong · 13 years ago
  30. e3b80c8 Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 by James Dong · 13 years ago
  31. 6a91953 am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds by Marco Nelissen · 13 years ago
  32. d8b027b Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" by Conley Owens · 13 years ago
  33. 90dc22f am a02d9bf9: Make sure we don\'t read from invalid fds by Marco Nelissen · 13 years ago
  34. a02d9bf Make sure we don't read from invalid fds by Marco Nelissen · 13 years ago
  35. 8e97372 am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. by Andreas Huber · 13 years ago
  36. 8050a02 DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. by Andreas Huber · 14 years ago
  37. c004a0c am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 by James Dong · 13 years ago
  38. 05e13b9 am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 by James Dong · 13 years ago
  39. 64a2343 Revert "Use pread() to get the decrypted data for container based DRM file." by James Dong · 13 years ago
  40. c41a17d am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 by Jeffrey Tinker · 13 years ago
  41. 6e5cdca am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 by Jeffrey Tinker · 13 years ago
  42. ef89cc1 Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 by Jeffrey Tinker · 13 years ago
  43. 8264641 Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 by Jeffrey Tinker · 13 years ago
  44. d576258 am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). by James Dong · 13 years ago
  45. ebae192 am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). by James Dong · 13 years ago
  46. a5293d1 Add some logging to track down where ANR happens during MediaPlayer._release(). by James Dong · 13 years ago
  47. 4d8cead am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. by Gloria Wang · 13 years ago
  48. dbfd055 am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. by Gloria Wang · 13 years ago
  49. a6f1104 Use pread() to get the decrypted data for container based DRM file. by Gloria Wang · 13 years ago
  50. cd454fa Revert "Add avg bandwidth estimate every 2 seconds - do not merge." by James Dong · 13 years ago
  51. a8939e0 am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 by James Dong · 13 years ago
  52. 380244e am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 by James Dong · 13 years ago
  53. d148a49 Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 by James Dong · 13 years ago
  54. 8d161fe am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 by Gloria Wang · 13 years ago
  55. 5a6c3d4 am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 by Gloria Wang · 13 years ago
  56. 07e9267 Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 by Gloria Wang · 13 years ago
  57. 53b988b am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 by Mike Lockwood · 13 years ago
  58. 5a79cfd am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 by Mike Lockwood · 13 years ago
  59. fbfe555 StorageVolume: Add getStorageId() accessor by Mike Lockwood · 13 years ago
  60. c9eb18b am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 by Andreas Huber · 13 years ago
  61. bf81d4b am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 by Andreas Huber · 13 years ago
  62. c56e81c Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 by Andreas Huber · 13 years ago
  63. f97ed77 am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 by Dianne Hackborn · 13 years ago
  64. d90a2c4 am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 by Dianne Hackborn · 13 years ago
  65. 1e662c3 Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 by Dianne Hackborn · 13 years ago
  66. b107f4d am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 by Mike Lockwood · 13 years ago
  67. fc4a3d3 am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 by Mike Lockwood · 13 years ago
  68. e23639e am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 by Mike Lockwood · 13 years ago
  69. b822d24 am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 by Mike Lockwood · 13 years ago
  70. ac8dea1 DO NOT MERGE. Integrate from master: Rework display size access. by Dianne Hackborn · 13 years ago
  71. 5169054 MTP: Have GetStorageInfo command return correct storage type for removable storage by Mike Lockwood · 13 years ago
  72. 2f6a388 StorageManager: Clean up and generalize storage configuration resources by Mike Lockwood · 13 years ago
  73. 331de5d DO NOT MERGE For bug 4422428 Squashed commit of the following: by Gloria Wang · 13 years ago
  74. 77d8dc2 Using widevine:// to stream adaptive bitrate wvm content no longer by Andreas Huber · 13 years ago
  75. 158e358 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 by The Android Automerger · 13 years ago
  76. 9603fde am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1 by Scott Main · 13 years ago
  77. 0d560d4 am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1 by Scott Main · 13 years ago
  78. 0cdd9f7 docs: add package description for mtp and a little more info to MtpDevice by Scott Main · 13 years ago
  79. b1071331c DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2 by Andreas Huber · 13 years ago
  80. 63de615 am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath() by Mike Lockwood · 13 years ago
  81. 0faefb7 am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic by Mike Lockwood · 13 years ago
  82. df88944 am a792c804: DO NOT MERGE MTP: Implement GetThumb command by Mike Lockwood · 13 years ago
  83. af964a6 am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions by Mike Lockwood · 13 years ago
  84. eeaf48c am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files by Mike Lockwood · 13 years ago
  85. f6df5b4 am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider by Mike Lockwood · 13 years ago
  86. 863ee40 am 7dd59229: DO NOT MERGE Fix media scanner uri handling. by Marco Nelissen · 13 years ago
  87. 21c0800 am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices: by Mike Lockwood · 13 years ago
  88. 36132a4 DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath() by Mike Lockwood · 13 years ago
  89. 8b1c74f DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic by Mike Lockwood · 13 years ago
  90. a792c80 DO NOT MERGE MTP: Implement GetThumb command by Mike Lockwood · 13 years ago
  91. af50821 DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions by Mike Lockwood · 13 years ago
  92. fdb50e6 DO NOT MERGE MTP: Add extended operations to support in-place editing of files by Mike Lockwood · 13 years ago
  93. fb62326 DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider by Mike Lockwood · 13 years ago
  94. 7dd5922 DO NOT MERGE Fix media scanner uri handling. by Marco Nelissen · 13 years ago
  95. d3e4290c DO NOT MERGE MTP and media provider support for multiple storage devices: by Mike Lockwood · 13 years ago
  96. c56ad54 DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath() by Mike Lockwood · 13 years ago
  97. 71b3342 DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic by Mike Lockwood · 13 years ago
  98. 710a206 DO NOT MERGE MTP: Implement GetThumb command by Mike Lockwood · 13 years ago
  99. 7fc3beb DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions by Mike Lockwood · 13 years ago
  100. 371279f DO NOT MERGE MTP: Add extended operations to support in-place editing of files by Mike Lockwood · 13 years ago