Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / edb1ed6461e7d2a9b5d772ad7e27b928800a6ff2
commitedb1ed6461e7d2a9b5d772ad7e27b928800a6ff2[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Jan 07 01:49:53 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Jan 07 01:49:53 2021 +0000
tree73faa5a2aaf7de3d9ab3ff4a8629fbb17572cd05
parent67c9be734f80d891b984a5d56e1b34ec0ed5e92c [diff]
parent1bfde096c3fe0b36208f0a491744dc716b92883c [diff]
[automerger skipped] Merge changes from topic "am-8fe1bfad79f84157a29ab2e38769dd1e" into rvc-qpr-dev-plus-aosp am: 1bfde096c3 -s ours

am skip reason: Change-Id I7a240621267648ea54e7dc737ebc55bc665e39b6 with SHA-1 346eed7325 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb9cc9164046f0003ae8ae1753ec731a0c78288a
tree: 73faa5a2aaf7de3d9ab3ff4a8629fbb17572cd05
  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. obex/
  24. opengl/
  25. packages/
  26. proto/
  27. rs/
  28. samples/
  29. sax/
  30. services/
  31. startop/
  32. telecomm/
  33. telephony/
  34. test-base/
  35. test-legacy/
  36. test-mock/
  37. test-runner/
  38. tests/
  39. tools/
  40. wifi/
  41. .clang-format
  42. .gitignore
  43. .mailmap
  44. Android.bp
  45. Android.mk
  46. ApiDocs.bp
  47. BATTERY_STATS_OWNERS
  48. CleanSpec.mk
  49. framework-jarjar-rules.txt
  50. METADATA
  51. MODULE_LICENSE_APACHE2
  52. NOTICE
  53. OWNERS
  54. OWNERS.md
  55. pathmap.mk
  56. PREUPLOAD.cfg
  57. StubLibraries.bp
  58. TEST_MAPPING
  59. ZYGOTE_OWNERS