1. 6bb5cb2 Resolved conflicts for merge of 28c6ec02 to master by Narayan Kamath · 11 years ago
  2. 24d63a8 am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes" by Narayan Kamath · 11 years ago
  3. f761fa7 Merge "Remove calls to deprecated SkBitmap::setIsOpaque()" by Leon Scroggins III · 11 years ago
  4. 0c5b627 Merge "Unhide android.media.AudioTrack.setVolume(float)" by Glenn Kasten · 11 years ago
  5. 8790be6 Remove calls to deprecated SkBitmap::setIsOpaque() by Leon Scroggins III · 11 years ago
  6. 075e9a1 AArch64: Use long for pointers in media classes by Ashok Bhat · 11 years ago
  7. 4896cb5 Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0" by Glenn Kasten · 11 years ago
  8. 3e21cc8 Unhide android.media.AudioTrack.setVolume(float) by Glenn Kasten · 11 years ago
  9. 633f8c2 am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" by Marco Nelissen · 11 years ago
  10. 1324941 am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" by Marco Nelissen · 11 years ago
  11. 337aa37 Merge "Add NULL check in updateProxyConfig" by Marco Nelissen · 11 years ago
  12. f634bc0 Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM" by Glenn Kasten · 11 years ago
  13. 92351c5 libjhead_jni is still needed by Marco Nelissen · 11 years ago
  14. 93899a5 Merge "setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" by Zhihai Xu · 11 years ago
  15. 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
  16. 411350d am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm" by Jason Sams · 11 years ago
  17. 2f4a2b1 setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager by Zhihai Xu · 11 years ago
  18. 868173a Merge "Fix a JNI local reference leak in MediaDrm" by Jason Sams · 11 years ago
  19. fe834d3 Prepare for additional formats beyond 8-bit and 16-bit PCM by Glenn Kasten · 11 years ago
  20. 3cd393c Make MtpDatabase use libexif instead of libjhead by Marco Nelissen · 11 years ago
  21. 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
  22. 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
  23. 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
  24. 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
  25. 0dce19c am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" by Narayan Kamath · 11 years ago
  26. 23ebc24 am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" by Narayan Kamath · 11 years ago
  27. bfbe585 am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" by Narayan Kamath · 11 years ago
  28. 568cde5 am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" by Narayan Kamath · 11 years ago
  29. e2e5932 AArch64: Use long for pointers in MTP classes by Ashok Bhat · 11 years ago
  30. 44ba5c1 AArch64: Use long for pointers in VideoEditor classes by Ashok Bhat · 11 years ago
  31. ea7861c AArch64: Use long for pointers in audio effect classes by Ashok Bhat · 11 years ago
  32. b348c3f AArch64: Use long for pointers in AmrInputStream by Ashok Bhat · 11 years ago
  33. a144b12 Merge "Fix RemoteController synchronization mode" by Jean-Michel Trivi · 11 years ago
  34. 83cc994 MediaRecorder: add getSurface() api and SURFACE video source by Chong Zhang · 11 years ago
  35. b3ae913 Fix RemoteController synchronization mode by Jean-Michel Trivi · 11 years ago
  36. 934349e ExifInterface: fix class load failure by Zhijun He · 11 years ago
  37. e754e78 Merge "libexif is now libjhead" by Marco Nelissen · 11 years ago
  38. 7f6abf8 libexif is now libjhead by Marco Nelissen · 11 years ago
  39. 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
  40. 91f6aaa am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." by Narayan Kamath · 11 years ago
  41. f3172c6 Merge "MediaDrm#mNativeContext is a long, not int." by Narayan Kamath · 11 years ago
  42. 265551a Fix a JNI local reference leak in MediaDrm by Patrik2 Carlsson · 11 years ago
  43. e795ec7 Add NULL check in updateProxyConfig by Oscar Rydhé · 11 years ago
  44. 94ee2f5 am 52ba48a8: am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" by Narayan Kamath · 11 years ago
  45. 4dd5c37 am be8fbb8f: Merge "Remove unused field from MediaMuxer" by Narayan Kamath · 11 years ago
  46. 535daa1 Remove unused field from MediaMuxer by Narayan Kamath · 11 years ago
  47. f11dd63 MediaDrm#mNativeContext is a long, not int. by Narayan Kamath · 11 years ago
  48. 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
  49. a012fee am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" by Elliott Hughes · 11 years ago
  50. 5d6332e Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" by Elliott Hughes · 11 years ago
  51. 6a0db59 resolved conflicts for merge of e0b14ea7 to master by Kenny Root · 11 years ago
  52. 62d509d am 37c69fdd: Merge "Use java.util.Objects instead on internal API" by Kenny Root · 11 years ago
  53. e6585b3 Use java.util.Objects instead on internal API by Kenny Root · 11 years ago
  54. 55d7062 Add caption window color attribute by Alan Viverette · 11 years ago
  55. 656fd04 AArch64: Use long for pointers in MediaDrm and MediaMuxer by Ashok Bhat · 11 years ago
  56. a16a979 Update comments for AudioRecord IllegalArgumentException by Glenn Kasten · 11 years ago
  57. 19294ca Document need to call AudioRecord.getState() after construction by Glenn Kasten · 11 years ago
  58. a4b06fd Fix typo nbChannels -> channelMask by Glenn Kasten · 11 years ago
  59. 2ab3ec2 am 2458681b: am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed. by Jeff Brown · 11 years ago
  60. 2458681 am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed. by Jeff Brown · 11 years ago
  61. ce468a3 Stop wifi display discovery when no longer needed. by Jeff Brown · 11 years ago
  62. ab6294e am db44cb92: am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev by Chong Zhang · 11 years ago
  63. db44cb9 am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev by Chong Zhang · 11 years ago
  64. 6090995 Remove unused imports from frameworks/base. by John Spurlock · 11 years ago
  65. a68c87e Only scan for wifi display when there is no active connections by Chong Zhang · 11 years ago
  66. 30cb5c3 am 2ea480ca: am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev by Jeff Brown · 11 years ago
  67. 2ea480c am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev by Jeff Brown · 11 years ago
  68. af57418 Disallow applications from initiating cast screen. by Jeff Brown · 11 years ago
  69. 48f42fa am 7c9adaf6: am dc6da58a: am 2a96fc1f: Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev by Jean-Michel Trivi · 11 years ago
  70. 7c9adaf am dc6da58a: am 2a96fc1f: Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev by Jean-Michel Trivi · 11 years ago
  71. 320ad9f Fix RemoteController update in RemoteControlClient registration by Jean-Michel Trivi · 11 years ago
  72. a3da462 am 1fbb5da2: am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev by Craig Mautner · 11 years ago
  73. 3857dbe am 84f4ad80: am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." by Elliott Hughes · 11 years ago
  74. 84f4ad8 am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." by Elliott Hughes · 11 years ago
  75. 99f7521 Fix a JNI local reference leak in JNIMediaPlayerListener::notify. by Elliott Hughes · 11 years ago
  76. 12c39dd am 9ffc4a65: am 854395ad: am c481a634: Merge "UI tweaks." into klp-dev by Jeff Brown · 11 years ago
  77. 39ad0e5 UI tweaks. by Jeff Brown · 11 years ago
  78. 08432a4 am fa0d9c2f: am 02b77575: am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev by Jeff Brown · 11 years ago
  79. b530aeb resolved conflicts for merge of f0b9ee96 to master by Jeff Brown · 11 years ago
  80. 19001d2 am 9a05e846: am f32962a8: am e8d0fbf2: Merge "Fixed a bug updating presentation displays." into klp-dev by Chong Zhang · 11 years ago
  81. 75af171 Changes to support new screen cast settings screen. by Jeff Brown · 11 years ago
  82. dd4f9e8 Merge "Update the media router dialogs and integrate into system UI." into klp-dev by Jeff Brown · 11 years ago
  83. 0abd3a6 Update the media router dialogs and integrate into system UI. by Jeff Brown · 11 years ago
  84. 5830b0b Fixed a bug updating presentation displays. by Chong Zhang · 11 years ago
  85. 7da5bbe am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev by Jeff Brown · 11 years ago
  86. 6c58d89 am 84d76025: am eb223425: am 1f7a8a06: Merge "Add a platform library for remote display providers." into klp-dev by Jeff Brown · 11 years ago
  87. d40a4d7 Merge "Add media router service and integrate with remote displays." into klp-dev by Jeff Brown · 11 years ago
  88. 1f7a8a0 Merge "Add a platform library for remote display providers." into klp-dev by Jeff Brown · 11 years ago
  89. 69b0716 Add media router service and integrate with remote displays. by Jeff Brown · 11 years ago
  90. f3c99e8 Add a platform library for remote display providers. by Jeff Brown · 11 years ago
  91. b84a72c Merge "Revert "Add "throws IOException" to MediaCodec constructors (3)"" by Andy Hung · 11 years ago
  92. 8ca55fc Revert "Add "throws IOException" to MediaCodec constructors (3)" by Andy Hung · 11 years ago
  93. 928f9fe Merge "Add "throws IOException" to MediaCodec constructors (3)" by Andy Hung · 11 years ago
  94. 4feaa2e am 1a231f5f: am e661b541: am 7791b84c: Merge "AudioService: fix notifications with A2DP abs volume" into klp-dev by Eric Laurent · 11 years ago
  95. 52d8aa7 Add "throws IOException" to MediaCodec constructors (3) by Andy Hung · 11 years ago
  96. cd772d0 AudioService: fix notifications with A2DP abs volume by Eric Laurent · 11 years ago
  97. 128537f am f57530e4: am fcd69ca4: am 66b753b0: Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev by Lajos Molnar · 11 years ago
  98. 66b753b Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev by Lajos Molnar · 11 years ago
  99. 4de8e7c MediaPlayer: MTP: update state only based on source events by Lajos Molnar · 11 years ago
  100. cfcd53a am 33f713d2: am a60057c0: am d4249251: Merge "Limit RemoteControlClient generation ID changes" into klp-dev by Jean-Michel Trivi · 11 years ago