1. d7edfe0 Merge "Benchmark: Add SDK Encoder" am: 21b5385388 am: 6447c6f569 am: 7880cc8cfd by Ruchika Ashtankar · 6 years ago
  2. 7880cc8 Merge "Benchmark: Add SDK Encoder" am: 21b5385388 am: 6447c6f569 by Ruchika Ashtankar · 6 years ago
  3. 6447c6f Merge "Benchmark: Add SDK Encoder" am: 21b5385388 by Ruchika Ashtankar · 6 years ago
  4. 21b5385 Merge "Benchmark: Add SDK Encoder" by Treehugger Robot · 6 years ago
  5. 38d3767 Merge "Move MediaDeviceInfo to libamidi, its only user" am: 10e7728c36 am: 6ef88eb927 by Marco Nelissen · 6 years ago
  6. e25539a Merge changes from topic "libdrmframework" am: 84a53822a1 am: 460618a6d1 by Dongwon Kang · 6 years ago
  7. 72e4fda Merge "MediaCodecsXmlParser: Make limit logging less verbose" am: 80d3d96941 am: b87d0ade25 by Yanqiang Fan · 6 years ago
  8. 5b046d1 Merge "Benchmark: Add SDK Muxer" am: e913c81d86 am: 45539760f2 am: 8dee8f2d7d by Ruchika Ashtankar · 6 years ago
  9. e709d74 Merge "Benchmark: Remove address sanitize from defaults." am: 44f4d8167b am: 5e2dad3ac8 by Manisha Jajoo · 6 years ago
  10. e3b3be4 Merge changes from topic "camera_ndk_fixes" am: 35f148bc5a am: ee6b817886 by Jayant Chowdhary · 6 years ago
  11. 513c0f4 [automerger skipped] AImage: don't allow ~AImageReader to run before AImages are deleted. am: 9ddd6e8d9e -s ours am: b340eb8a28 -s ours by Jayant Chowdhary · 6 years ago
  12. 2a38fee Merge changes from topic "hiddenCameraDeadlock" am: c52243f298 am: 8863a154f8 by Jayant Chowdhary · 6 years ago
  13. a550f4a Merge "Move MediaDeviceInfo to libamidi, its only user" am: 10e7728c36 by Marco Nelissen · 6 years ago
  14. c317c58 Merge changes from topic "libdrmframework" am: 84a53822a1 am: 460618a6d1 by Dongwon Kang · 6 years ago
  15. 6ef88eb Merge "Move MediaDeviceInfo to libamidi, its only user" am: 10e7728c36 by Marco Nelissen · 6 years ago
  16. 460618a Merge changes from topic "libdrmframework" am: 84a53822a1 by Dongwon Kang · 6 years ago
  17. 10e7728 Merge "Move MediaDeviceInfo to libamidi, its only user" by Marco Nelissen · 6 years ago
  18. 84a5382 Merge changes from topic "libdrmframework" by Dongwon Kang · 6 years ago
  19. 31ee1db Move MediaDeviceInfo to libamidi, its only user by Marco Nelissen · 6 years ago
  20. 7895a45 Benchmark: Add SDK Encoder by Ruchika Ashtankar · 6 years ago
  21. f3b4f84 Merge "MediaCodecsXmlParser: Make limit logging less verbose" am: 80d3d96941 by Yanqiang Fan · 6 years ago
  22. 8dee8f2 Merge "Benchmark: Add SDK Muxer" am: e913c81d86 am: 45539760f2 by Ruchika Ashtankar · 6 years ago
  23. b87d0ad Merge "MediaCodecsXmlParser: Make limit logging less verbose" am: 80d3d96941 by Yanqiang Fan · 6 years ago
  24. 4553976 Merge "Benchmark: Add SDK Muxer" am: e913c81d86 by Ruchika Ashtankar · 6 years ago
  25. 80d3d96 Merge "MediaCodecsXmlParser: Make limit logging less verbose" by Treehugger Robot · 6 years ago
  26. e913c81 Merge "Benchmark: Add SDK Muxer" by Treehugger Robot · 6 years ago
  27. 31706c8 resolve merge conflicts of f7b975c56a98c3134adc5dc95834673eeee81f0d to qt-qpr1-dev-plus-aosp by Jayant Chowdhary · 6 years ago
  28. 1d12b22 Merge "Benchmark: Remove address sanitize from defaults." am: 44f4d8167b by Manisha Jajoo · 6 years ago
  29. 5e2dad3 Merge "Benchmark: Remove address sanitize from defaults." am: 44f4d8167b by Manisha Jajoo · 6 years ago
  30. 44f4d81 Merge "Benchmark: Remove address sanitize from defaults." by Treehugger Robot · 6 years ago
  31. 6928bc3 Merge changes from topic "camera_ndk_fixes" am: 35f148bc5a am: ee6b817886 by Jayant Chowdhary · 6 years ago
  32. 78f605b [automerger skipped] AImage: don't allow ~AImageReader to run before AImages are deleted. am: 9ddd6e8d9e -s ours by Jayant Chowdhary · 6 years ago
  33. ee6b817 Merge changes from topic "camera_ndk_fixes" am: 35f148bc5a by Jayant Chowdhary · 6 years ago
  34. b340eb8 [automerger skipped] AImage: don't allow ~AImageReader to run before AImages are deleted. by Jayant Chowdhary · 6 years ago
  35. f7b975c Merge changes from topic "hiddenCameraDeadlock" am: c52243f298 am: 8863a154f8 by Jayant Chowdhary · 6 years ago
  36. 35f148b Merge changes from topic "camera_ndk_fixes" by Jayant Chowdhary · 6 years ago
  37. 8863a15 Merge changes from topic "hiddenCameraDeadlock" am: c52243f298 by Jayant Chowdhary · 6 years ago
  38. f94b6d6 Merge "Move AudioPlayer to test commands" am: 4426ce8d95 am: 4520fef512 by Marco Nelissen · 6 years ago
  39. c52243f Merge changes from topic "hiddenCameraDeadlock" by Jayant Chowdhary · 6 years ago
  40. 8429516 Merge "Move AudioPlayer to test commands" am: 4426ce8d95 am: 4520fef512 by Marco Nelissen · 6 years ago
  41. 4520fef Merge "Move AudioPlayer to test commands" am: 4426ce8d95 by Marco Nelissen · 6 years ago
  42. 4426ce8 Merge "Move AudioPlayer to test commands" by Marco Nelissen · 6 years ago
  43. cb1077d Merge "libmediadrm: fix a use of an uninit value" am: 3ba521f0ba am: 87e6db673a by George Burgess IV · 6 years ago
  44. 544847b Merge "libmediadrm: fix a use of an uninit value" am: 3ba521f0ba am: 87e6db673a by George Burgess IV · 6 years ago
  45. d31bbe0 MediaCodecsXmlParser: Make limit logging less verbose by Yanqiang Fan · 6 years ago
  46. 87e6db6 Merge "libmediadrm: fix a use of an uninit value" am: 3ba521f0ba by George Burgess IV · 6 years ago
  47. 3ba521f Merge "libmediadrm: fix a use of an uninit value" by Treehugger Robot · 6 years ago
  48. 1edb68c Move AudioPlayer to test commands by Marco Nelissen · 6 years ago
  49. c42403d libmediadrm: fix a use of an uninit value by George Burgess IV · 6 years ago
  50. 3ceafe5 Benchmark: Remove address sanitize from defaults. by Manisha Jajoo · 6 years ago
  51. 94d8d3b Benchmark: Add SDK Muxer by Ruchika Ashtankar · 6 years ago
  52. 39180fc Merge "Benchmark: Add SDK Decoder" am: 03379fb2cc am: 42e055cd58 am: 172e15dd36 by Ray Essick · 6 years ago
  53. 6fba92a Merge "Benchmark : Add flac vectors for DecoderTest and EncoderTest" am: 90157191c2 am: 2f2030e041 by Ray Essick · 6 years ago
  54. 172e15d Merge "Benchmark: Add SDK Decoder" am: 03379fb2cc am: 42e055cd58 by Ray Essick · 6 years ago
  55. a208f2f Merge "Benchmark : Add flac vectors for DecoderTest and EncoderTest" am: 90157191c2 by Ray Essick · 6 years ago
  56. 42e055c Merge "Benchmark: Add SDK Decoder" am: 03379fb2cc by Ray Essick · 6 years ago
  57. 2f2030e Merge "Benchmark : Add flac vectors for DecoderTest and EncoderTest" by Ray Essick · 6 years ago
  58. 03379fb Merge "Benchmark: Add SDK Decoder" by Ray Essick · 6 years ago
  59. 9015719 Merge "Benchmark : Add flac vectors for DecoderTest and EncoderTest" by Ray Essick · 6 years ago
  60. 38ea069 Merge "Move JetPlayer to JNI" am: 77185b7f00 am: 23986da952 am: bab95e0b6f by Marco Nelissen · 6 years ago
  61. bab95e0 Merge "Move JetPlayer to JNI" am: 77185b7f00 am: 23986da952 by Marco Nelissen · 6 years ago
  62. 23986da Merge "Move JetPlayer to JNI" am: 77185b7f00 by Marco Nelissen · 6 years ago
  63. 77185b7 Merge "Move JetPlayer to JNI" by Marco Nelissen · 6 years ago
  64. 1e7d2e9 Move JetPlayer to JNI by Marco Nelissen · 6 years ago
  65. 3aed5c9 Merge "libstagefright doesn't need libFLAC" am: a870fb0afa am: 625149dd57 by Marco Nelissen · 6 years ago
  66. 086ccfd Merge "libstagefright doesn't need libFLAC" am: a870fb0afa am: 625149dd57 by Marco Nelissen · 6 years ago
  67. 625149d Merge "libstagefright doesn't need libFLAC" am: a870fb0afa by Marco Nelissen · 6 years ago
  68. a870fb0 Merge "libstagefright doesn't need libFLAC" by Marco Nelissen · 6 years ago
  69. fcf3a3c Benchmark: Add SDK Decoder by Shivaansh Agrawal · 6 years ago
  70. 76f35ab Merge "Revert "adapt ld.config.txt for vndk apex"" am: 055ded38f4 am: 36f40f8dd5 by Jooyung Han · 6 years ago
  71. 5e42ca0 Merge "Revert "adapt ld.config.txt for vndk apex"" am: 055ded38f4 am: 36f40f8dd5 by Jooyung Han · 6 years ago
  72. 36f40f8 Merge "Revert "adapt ld.config.txt for vndk apex"" am: 055ded38f4 by Jooyung Han · 6 years ago
  73. 055ded3 Merge "Revert "adapt ld.config.txt for vndk apex"" by Treehugger Robot · 6 years ago
  74. e23a299 Revert "adapt ld.config.txt for vndk apex" by Jooyung Han · 6 years ago
  75. 26dfad2 libstagefright doesn't need libFLAC by Marco Nelissen · 6 years ago
  76. 35e234f Merge "Remove IMediaCodecList.cpp and MediaCodecInfo.cpp from libmedia_omx." am: 0ce3a03b74 am: 7a40942219 by Dongwon Kang · 6 years ago
  77. d8a53c7 Merge "Remove IMediaCodecList.cpp and MediaCodecInfo.cpp from libmedia_omx." am: 0ce3a03b74 by Dongwon Kang · 6 years ago
  78. fd39db8 cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera(). by Jayant Chowdhary · 6 years ago
  79. 7a40942 Merge "Remove IMediaCodecList.cpp and MediaCodecInfo.cpp from libmedia_omx." by Dongwon Kang · 6 years ago
  80. 0ce3a03 Merge "Remove IMediaCodecList.cpp and MediaCodecInfo.cpp from libmedia_omx." by Treehugger Robot · 6 years ago
  81. 56c3307 Do not include hidden secure cameras in camera1: getNumberOfCameras by Jayant Chowdhary · 6 years ago
  82. e61ecac Remove IMediaCodecList.cpp and MediaCodecInfo.cpp from libmedia_omx. by Dongwon Kang · 6 years ago
  83. e85ce19 Merge "Remove unnecessary inheritance" am: e2a67de73c am: 91a62afc5b by Marco Nelissen · 6 years ago
  84. 3241133 Merge "Remove unnecessary inheritance" am: e2a67de73c am: 91a62afc5b by Marco Nelissen · 6 years ago
  85. 91a62af Merge "Remove unnecessary inheritance" am: e2a67de73c by Marco Nelissen · 6 years ago
  86. e2a67de Merge "Remove unnecessary inheritance" by Marco Nelissen · 6 years ago
  87. 9c6f790 Remove libdrmframework.so dependency from libdatasource.so by Dongwon Kang · 6 years ago
  88. ecd8336 Merge "libmedia: separate codeclist from libmedia" am: 1f72838954 am: 8b470dc956 by Dongwon Kang · 6 years ago
  89. 81d1403 Merge "libmedia: separate codeclist from libmedia" am: 1f72838954 am: 8b470dc956 by Dongwon Kang · 6 years ago
  90. 95b2cf6 Remove unnecessary inheritance by Marco Nelissen · 6 years ago
  91. 79b0c24 Make DataSourceFactory singletone by Dongwon Kang · 6 years ago
  92. aa9c382 Merge "adapt ld.config.txt for vndk apex" am: 5b388b5905 am: 07bd8e7740 by Jooyung Han · 6 years ago
  93. d9f7389 Merge "adapt ld.config.txt for vndk apex" am: 5b388b5905 am: 07bd8e7740 by Jooyung Han · 6 years ago
  94. 8b470dc Merge "libmedia: separate codeclist from libmedia" am: 1f72838954 by Dongwon Kang · 6 years ago
  95. 3bc3c71 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 69ec1691d7 by Xin Li · 6 years ago
  96. b370033 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 69ec1691d7 by Xin Li · 6 years ago
  97. 1f72838 Merge "libmedia: separate codeclist from libmedia" by Treehugger Robot · 6 years ago
  98. 07bd8e7 Merge "adapt ld.config.txt for vndk apex" am: 5b388b5905 by Jooyung Han · 6 years ago
  99. 5b388b5 Merge "adapt ld.config.txt for vndk apex" by Jooyung Han · 6 years ago
  100. 69ec169 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master by Xin Li · 6 years ago