1. 2432912 resolved conflicts for merge of f8272896 to master by Elliott Hughes · 11 years ago
  2. f827289 am bd1949a4: am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt." by Elliott Hughes · 11 years ago
  3. 9f47b84 Merge "AudioAttributes: parcelable, hide support for tags" by Jean-Michel Trivi · 11 years ago
  4. 9fa803b [LP64] Fix access to MediaAlbumArt. by Elliott Hughes · 11 years ago
  5. 42cdf48 am e637e614: Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev by Eric Laurent · 11 years ago
  6. a335e14 Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev by Eric Laurent · 11 years ago
  7. e94379b remove debug log in AudioPortEventHandler. by Eric Laurent · 11 years ago
  8. b45c273 AudioAttributes: parcelable, hide support for tags by Jean-Michel Trivi · 11 years ago
  9. 7d10873 am dd76759d: Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev by Eric Laurent · 11 years ago
  10. 450758a am 65d95bfa: Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev by Dongwon Kang · 11 years ago
  11. 8da2139 Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev by Eric Laurent · 11 years ago
  12. 6dd6a3d Merge "Update android.media.AudioTrack.getTimestamp API documentation" by Glenn Kasten · 11 years ago
  13. 39f5300 Merge "AudioFormat class" by Jean-Michel Trivi · 11 years ago
  14. 2e0bacc am 594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev by Jae Seo · 11 years ago
  15. f573765 am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and SettingsActivity" into lmp-preview-dev by Chulwoo Lee · 11 years ago
  16. 4c9e57f resolved conflicts for merge of ebe661c4 to master by Jae Seo · 11 years ago
  17. 7b2ae34 Merge "Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application." into lmp-preview-dev by Dongwon Kang · 11 years ago
  18. f723f8e AudioFormat class by Jean-Michel Trivi · 11 years ago
  19. b4e0909 AudioManager: fix AudioPort gain query by Eric Laurent · 11 years ago
  20. a3be12a Add onAudioStreamChanged and onClosedCaptionStreamChanged callbacks from TIS to application. by Dongwon Kang · 11 years ago
  21. 6fbe398 Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev by Jae Seo · 11 years ago
  22. e7bb7d6 Add a way to get the class name of SetupActivity and SettingsActivity by Chulwoo Lee · 11 years ago
  23. bd23fa0 TvContract: Address the feedback from the API review by Jae Seo · 11 years ago
  24. 9dc96cf am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." by Mike Lockwood · 11 years ago
  25. 307a37c am 1ac54ec6: am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." by Mike Lockwood · 11 years ago
  26. a0183b0 am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." by Mike Lockwood · 11 years ago
  27. 1ac54ec am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." by Mike Lockwood · 11 years ago
  28. 8868d12 am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." by Mike Lockwood · 11 years ago
  29. 750e78b am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." by Mike Lockwood · 11 years ago
  30. d5cc4a2 Put TV Input Framework under android.media.tv, including TvContract by Jae Seo · 11 years ago
  31. 830fd70 am c7ed6f69: Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev by RoboErik · 11 years ago
  32. e78755e Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev by RoboErik · 11 years ago
  33. 3a4398a am 209fc1ae: AudioManager: do not mandate a looper by Eric Laurent · 11 years ago
  34. ddc93ce AudioManager: do not mandate a looper by Eric Laurent · 11 years ago
  35. 4179264 am bfea31fd: VolumeZen: Prevent raising ringer volume in silent mode. by John Spurlock · 11 years ago
  36. a11b4af VolumeZen: Prevent raising ringer volume in silent mode. by John Spurlock · 11 years ago
  37. 986b46d MtpDatabase JNI: Fixed incorrect method name in ALOGE. by Martin Blumenstingl · 11 years ago
  38. 17a24c5 MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue(). by Martin Blumenstingl · 11 years ago
  39. 3ed851b am f2e19a36: Merge "AudioManager: add audio port gain control" into lmp-preview-dev by Eric Laurent · 11 years ago
  40. 086995c am b4499f84: Merge "audio routing update listener" into lmp-preview-dev by Eric Laurent · 11 years ago
  41. ec2f4b0 am 47615317: Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-dev by Eric Laurent · 11 years ago
  42. 54b5e5b Merge "AudioManager: add audio port gain control" into lmp-preview-dev by Eric Laurent · 11 years ago
  43. 8725859 Merge "audio routing update listener" into lmp-preview-dev by Eric Laurent · 11 years ago
  44. a89eb2d Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-dev by Eric Laurent · 11 years ago
  45. 3a24199 AudioManager: add audio port gain control by Eric Laurent · 11 years ago
  46. 700e734 audio routing update listener by Eric Laurent · 11 years ago
  47. b69681c AudioSystem: added JNI for routing extensions by Eric Laurent · 11 years ago
  48. 8f3ee7d am d99ebf8b: Merge "Fix name error in com.android.mediadrm.signer.xml" into lmp-preview-dev by Jeff Tinker · 11 years ago
  49. 948d08d Merge "Fix name error in com.android.mediadrm.signer.xml" into lmp-preview-dev by Jeff Tinker · 11 years ago
  50. 2a48d42 am 7c9ed471: Merge changes I1fd178b6,I5093672e into lmp-preview-dev by Lajos Molnar · 11 years ago
  51. a6716aa Merge changes I1fd178b6,I5093672e into lmp-preview-dev by Lajos Molnar · 11 years ago
  52. b69ffd4 Minimum work to make volume handling work with sessions by RoboErik · 11 years ago
  53. 4e4160c am 80ec18a9: Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev by RoboErik · 11 years ago
  54. 283c907 Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev by RoboErik · 11 years ago
  55. dbce83b am 511b84d2: Merge "camera2: Change android.lens.focusRange to Pair<Float,Float>" into lmp-preview-dev by Igor Murashkin · 11 years ago
  56. 5743868 camera2: Change android.lens.focusRange to Pair<Float,Float> by Igor Murashkin · 11 years ago
  57. a037bce am a034dac7: android_media_MediaMuxer_setLocation: amended signature. by Robert Shih · 11 years ago
  58. c47fa84 Refactor transport controls APIs by RoboErik · 11 years ago
  59. 7b58788 Merge "indicate in and out audio device connection separately" by Eric Laurent · 11 years ago
  60. d6315a3 Fix name error in com.android.mediadrm.signer.xml by Jeff Tinker · 11 years ago
  61. a034dac android_media_MediaMuxer_setLocation: amended signature. by Robert Shih · 11 years ago
  62. ae4506e indicate in and out audio device connection separately by Eric Laurent · 11 years ago
  63. 5e078e49 am 6118de49: Merge "Camera2: Test null TonemapCurve behavior" into lmp-preview-dev by Yin-Chia Yeh · 11 years ago
  64. 789de11 Merge "Camera2: Test null TonemapCurve behavior" into lmp-preview-dev by Yin-Chia Yeh · 11 years ago
  65. 79fa463 API changes to sessions by RoboErik · 11 years ago
  66. c52f4e2 Update android.media.AudioTrack.getTimestamp API documentation by Glenn Kasten · 11 years ago
  67. 8c5d0f2 DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener by Lajos Molnar · 11 years ago
  68. acfcf64 media.MediaCodec: document and fix-up setNotificationCallback by Lajos Molnar · 11 years ago
  69. 8298472 Camera2: Test null TonemapCurve behavior by Yin-Chia Yeh · 11 years ago
  70. 0aa1cbb Merge "DO NOT MERGE - AudioManager: audio routing extensions" into lmp-preview-dev by Eric Laurent · 11 years ago
  71. 3378717 Merge "Add Audio Manager support for Bluetooth A2DP Sink profile" by Mike Lockwood · 11 years ago
  72. 0abcc5a0 DO NOT MERGE - AudioManager: audio routing extensions by Eric Laurent · 11 years ago
  73. 5b02e9f am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev by Eino-Ville Talvala · 11 years ago
  74. b9a65de Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev by Eino-Ville Talvala · 11 years ago
  75. 0a40ec2 Add Audio Manager support for Bluetooth A2DP Sink profile by Mike Lockwood · 11 years ago
  76. 8490ace Camera2: switch API interface to java classses by Yin-Chia Yeh · 11 years ago
  77. 78712a8 camera2: Add new metadata keys, change types for existing range keys by Igor Murashkin · 11 years ago
  78. 1ad0192 DO NOT MERGE temporary hide of AudioAttributes by Jean-Michel Trivi · 11 years ago
  79. bac10fa Merge "AudioManager: audio routing extensions" by Eric Laurent · 11 years ago
  80. a198a29 AudioManager: audio routing extensions by Eric Laurent · 11 years ago
  81. 53bd263 am c5890bb9: Merge "VolumeZen: combine ringer/notification volume and zen." into lmp-preview-dev by John Spurlock · 11 years ago
  82. 8600534 VolumeZen: combine ringer/notification volume and zen. by John Spurlock · 11 years ago
  83. 94ecb55 am a7c97c55: Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev by Ruben Brunk · 11 years ago
  84. 0bfa56e Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev by Ruben Brunk · 11 years ago
  85. e010437 Merge "Remove android.media.AudioFormat default constructor" by Glenn Kasten · 11 years ago
  86. 6b02c89 am 5231cb4b: am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" by Eric Laurent · 11 years ago
  87. 5231cb4 am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" by Eric Laurent · 11 years ago
  88. b928b7c am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" by Eric Laurent · 11 years ago
  89. fdbee86 AudioService: fix cross deadlock in VolumeStreamState by Eric Laurent · 11 years ago
  90. d6d6515 camera2: Refactor CameraMetadata.Key out into 3 key classes by Igor Murashkin · 11 years ago
  91. 1aa74e4 Remove android.media.AudioFormat default constructor by Glenn Kasten · 11 years ago
  92. b607900 camera2: Move DngCreator to hardware/camera2. by Ruben Brunk · 11 years ago
  93. 94520c7 Merge "camera2: Add HAL1 compatibility shim skeleton." by Ruben Brunk · 11 years ago
  94. 02014c8 Switch to using int stream instead of AudioAttributes by RoboErik · 11 years ago
  95. 33983a9 Add stream/volume apis to sessions by RoboErik · 11 years ago
  96. feb50af camera2: Add HAL1 compatibility shim skeleton. by Ruben Brunk · 11 years ago
  97. 5b53148 Merge changes I1cbdff1d,I23906b4c by RoboErik · 11 years ago
  98. ed72715 Merge "Update android.media.AudioTrack.getTimestamp API documentation" by Glenn Kasten · 11 years ago
  99. 7e1329f Build cast v2 mediadrm signer library as non-static by Jeff Tinker · 11 years ago
  100. 486918b Update android.media.AudioTrack.getTimestamp API documentation by Glenn Kasten · 11 years ago