Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 1b326539bc3b087aaca0a3904725e8b06457bc6c
commit1b326539bc3b087aaca0a3904725e8b06457bc6c[log] [tgz]
authorTreeHugger Robot <treehugger-gerrit@google.com>Thu Sep 24 20:41:01 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Sep 24 20:41:01 2020 +0000
tree33b8f90fb59eb8097dc53f9ea643949914203ed2
parent46292517f23679da5e34567c7e13443a0455421d [diff]
parentd6037a66b06a93b25ede1fd9bbe212b9ec400823 [diff]
[automerger skipped] Merge "Cancel pending timeouts when media data is removed" into rvc-qpr-dev am: 7040e32b1a am: d6037a66b0 -s ours

am skip reason: Change-Id I2925814132c712b2482681f699f647bf5707e664 with SHA-1 f5e463fa86 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12684219

Change-Id: I78ef401ba1f2dbcc5cec129b24ef853ca9b171a0
tree: 33b8f90fb59eb8097dc53f9ea643949914203ed2
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. cmds/
  6. config/
  7. core/
  8. data/
  9. docs/
  10. drm/
  11. errorprone/
  12. graphics/
  13. identity/
  14. keystore/
  15. libs/
  16. location/
  17. lowpan/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc-extras/
  23. non-updatable-api/
  24. obex/
  25. opengl/
  26. packages/
  27. proto/
  28. rs/
  29. samples/
  30. sax/
  31. services/
  32. startop/
  33. telecomm/
  34. telephony/
  35. test-base/
  36. test-legacy/
  37. test-mock/
  38. test-runner/
  39. tests/
  40. tools/
  41. wifi/
  42. .clang-format
  43. .gitignore
  44. .mailmap
  45. Android.bp
  46. Android.mk
  47. ApiDocs.bp
  48. CleanSpec.mk
  49. framework-jarjar-rules.txt
  50. METADATA
  51. MODULE_LICENSE_APACHE2
  52. NOTICE
  53. pathmap.mk
  54. PREUPLOAD.cfg
  55. StubLibraries.bp
  56. TEST_MAPPING