1. fc92763 Merge "Fix includes so that they no longer rely on the global Skia includes directories." by Derek Sollenberger · 11 years ago
  2. eece0dd Fix includes so that they no longer rely on the global Skia includes directories. by Derek Sollenberger · 11 years ago
  3. 950fe8f Cleanup unnecessary includes for libskia. by Derek Sollenberger · 11 years ago
  4. 8fb4cf1 Merge "Move Session apis to android.media.session" by RoboErik · 11 years ago
  5. 2f5b057 Move Session apis to android.media.session by RoboErik · 11 years ago
  6. a77cf87 Merge "Tabs -> spaces in frameworks/base." by John Spurlock · 11 years ago
  7. 8a985d2 Tabs -> spaces in frameworks/base. by John Spurlock · 11 years ago
  8. 8440a33 Merge "support time lapse/slow motion on SURFACE source" by Chong Zhang · 11 years ago
  9. 6e89ddc Add method to get redirected Uri by Marco Nelissen · 11 years ago
  10. 5f105a1 Another javadoc fix by RoboErik · 11 years ago
  11. 9524ed5 Fix build (bad javadoc reference) by RoboErik · 11 years ago
  12. 3328868 Merge "Initial round of MediaSession APIs" by RoboErik · 11 years ago
  13. 01fe661 Initial round of MediaSession APIs by RoboErik · 11 years ago
  14. d5a5797 Fix regression by Marco Nelissen · 11 years ago
  15. daa98ca support time lapse/slow motion on SURFACE source by Chong Zhang · 11 years ago
  16. cdf1d18 Update createInputSurface() doc by Andy McFadden · 11 years ago
  17. 9ae000c Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." by Andreas Huber · 11 years ago
  18. 7825334 Split AndroidRuntime into AndroidRuntimeBase base-class and the rest. by Andreas Huber · 11 years ago
  19. b1ed19a am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" by Narayan Kamath · 11 years ago
  20. 43c9516 am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" by Narayan Kamath · 11 years ago
  21. d2507a2 Fix in MediaMuxer's JNI code by Ashok Bhat · 11 years ago
  22. b341a24 Merge "Remove no longer needed http proxy handling code, it's obsolete now" by Andreas Huber · 11 years ago
  23. d7eab89 Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source" by Chong Zhang · 11 years ago
  24. 7da2747 Merge "android_media_MediaMuxer_setLocation: amended signature." by Robert Shih · 11 years ago
  25. f8a0c47 Remove no longer needed http proxy handling code, it's obsolete now by Andreas Huber · 11 years ago
  26. 3cb7849 android_media_MediaMuxer_setLocation: amended signature. by Robert Shih · 11 years ago
  27. cb1b23b Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code" by Andreas Huber · 11 years ago
  28. d2506a5 FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code by Andreas Huber · 11 years ago
  29. 93a5845 Cache media/nomedia paths by Marco Nelissen · 11 years ago
  30. 10586ad am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" by Zhijun He · 11 years ago
  31. 4f840dd am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" by Zhijun He · 11 years ago
  32. 0a1b64f Merge "Release locked buffer when it fails to acquire graphics buffer" by Zhijun He · 11 years ago
  33. 7ae1726 am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible" by Narayan Kamath · 11 years ago
  34. a039843 AArch64: Make graphics classes 64-bit compatible by Ashok Bhat · 11 years ago
  35. 3b02fe1 Merge "Fix invocation of notification callback in case the callback is modified" by Andreas Huber · 11 years ago
  36. 36bef0b AArch64: Make graphics classes 64-bit compatible by Ashok Bhat · 11 years ago
  37. 3347789 Release locked buffer when it fails to acquire graphics buffer by lina.x.pi · 11 years ago
  38. 329eec5 Fix invocation of notification callback in case the callback is modified by Andreas Huber · 11 years ago
  39. aba6713 API that allows usage of MediaCodec APIs without polling. by Andreas Huber · 11 years ago
  40. 7023df0 Revert "AArch64: Make graphics classes 64-bit compatible" by Narayan Kamath · 11 years ago
  41. 18b4cbe AArch64: Make graphics classes 64-bit compatible by Ashok Bhat · 11 years ago
  42. a091486 Merge "Check that the exif bits are actually there" by Marco Nelissen · 11 years ago
  43. 0937eed Check that the exif bits are actually there by Marco Nelissen · 11 years ago
  44. bdf8db0 Merge "Add "throws IOException" to MediaCodec factory methods" by Andy Hung · 11 years ago
  45. 83511d2 Add "throws IOException" to MediaCodec factory methods by Andy Hung · 11 years ago
  46. e996c41 MediaRecorderTest: add tests for getSurface() and SURFACE source by Chong Zhang · 11 years ago
  47. 6bb5cb2 Resolved conflicts for merge of 28c6ec02 to master by Narayan Kamath · 11 years ago
  48. 24d63a8 am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes" by Narayan Kamath · 11 years ago
  49. f761fa7 Merge "Remove calls to deprecated SkBitmap::setIsOpaque()" by Leon Scroggins III · 11 years ago
  50. 0c5b627 Merge "Unhide android.media.AudioTrack.setVolume(float)" by Glenn Kasten · 11 years ago
  51. 8790be6 Remove calls to deprecated SkBitmap::setIsOpaque() by Leon Scroggins III · 11 years ago
  52. 075e9a1 AArch64: Use long for pointers in media classes by Ashok Bhat · 11 years ago
  53. 4896cb5 Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0" by Glenn Kasten · 11 years ago
  54. 3e21cc8 Unhide android.media.AudioTrack.setVolume(float) by Glenn Kasten · 11 years ago
  55. 633f8c2 am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" by Marco Nelissen · 11 years ago
  56. 1324941 am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" by Marco Nelissen · 11 years ago
  57. 337aa37 Merge "Add NULL check in updateProxyConfig" by Marco Nelissen · 11 years ago
  58. f634bc0 Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM" by Glenn Kasten · 11 years ago
  59. 92351c5 libjhead_jni is still needed by Marco Nelissen · 11 years ago
  60. 93899a5 Merge "setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" by Zhihai Xu · 11 years ago
  61. 08af2ca am bb0a4f20: am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm" by Jason Sams · 11 years ago
  62. 411350d am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm" by Jason Sams · 11 years ago
  63. 2f4a2b1 setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager by Zhihai Xu · 11 years ago
  64. 868173a Merge "Fix a JNI local reference leak in MediaDrm" by Jason Sams · 11 years ago
  65. fe834d3 Prepare for additional formats beyond 8-bit and 16-bit PCM by Glenn Kasten · 11 years ago
  66. 3cd393c Make MtpDatabase use libexif instead of libjhead by Marco Nelissen · 11 years ago
  67. c975437 am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" by Narayan Kamath · 11 years ago
  68. 819f2e1 am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" by Narayan Kamath · 11 years ago
  69. e434ddd am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" by Narayan Kamath · 11 years ago
  70. ac8bd53 am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" by Narayan Kamath · 11 years ago
  71. 0dce19c am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" by Narayan Kamath · 11 years ago
  72. 23ebc24 am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" by Narayan Kamath · 11 years ago
  73. bfbe585 am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" by Narayan Kamath · 11 years ago
  74. 568cde5 am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" by Narayan Kamath · 11 years ago
  75. e2e5932 AArch64: Use long for pointers in MTP classes by Ashok Bhat · 11 years ago
  76. 44ba5c1 AArch64: Use long for pointers in VideoEditor classes by Ashok Bhat · 11 years ago
  77. ea7861c AArch64: Use long for pointers in audio effect classes by Ashok Bhat · 11 years ago
  78. b348c3f AArch64: Use long for pointers in AmrInputStream by Ashok Bhat · 11 years ago
  79. a144b12 Merge "Fix RemoteController synchronization mode" by Jean-Michel Trivi · 11 years ago
  80. 83cc994 MediaRecorder: add getSurface() api and SURFACE video source by Chong Zhang · 11 years ago
  81. b3ae913 Fix RemoteController synchronization mode by Jean-Michel Trivi · 11 years ago
  82. 934349e ExifInterface: fix class load failure by Zhijun He · 11 years ago
  83. e754e78 Merge "libexif is now libjhead" by Marco Nelissen · 11 years ago
  84. 7f6abf8 libexif is now libjhead by Marco Nelissen · 11 years ago
  85. 8907644 am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." by Narayan Kamath · 11 years ago
  86. 91f6aaa am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." by Narayan Kamath · 11 years ago
  87. f3172c6 Merge "MediaDrm#mNativeContext is a long, not int." by Narayan Kamath · 11 years ago
  88. 265551a Fix a JNI local reference leak in MediaDrm by Patrik2 Carlsson · 11 years ago
  89. e795ec7 Add NULL check in updateProxyConfig by Oscar Rydhé · 11 years ago
  90. 94ee2f5 am 52ba48a8: am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" by Narayan Kamath · 11 years ago
  91. 4dd5c37 am be8fbb8f: Merge "Remove unused field from MediaMuxer" by Narayan Kamath · 11 years ago
  92. 535daa1 Remove unused field from MediaMuxer by Narayan Kamath · 11 years ago
  93. f11dd63 MediaDrm#mNativeContext is a long, not int. by Narayan Kamath · 11 years ago
  94. 36d10e7 am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" by Elliott Hughes · 11 years ago
  95. a012fee am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" by Elliott Hughes · 11 years ago
  96. 5d6332e Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" by Elliott Hughes · 11 years ago
  97. 6a0db59 resolved conflicts for merge of e0b14ea7 to master by Kenny Root · 11 years ago
  98. 62d509d am 37c69fdd: Merge "Use java.util.Objects instead on internal API" by Kenny Root · 11 years ago
  99. e6585b3 Use java.util.Objects instead on internal API by Kenny Root · 11 years ago
  100. 55d7062 Add caption window color attribute by Alan Viverette · 11 years ago