Google Git
Sign in
android / platform / frameworks / base / f63b7f050157942bd6c1046853dc60e8f67a5a9c
commitf63b7f050157942bd6c1046853dc60e8f67a5a9c[log] [tgz]
authorAnton Hansson <[email protected]>Wed Apr 14 11:16:31 2021 +0000
committerAutomerger Merge Worker <[email protected]>Wed Apr 14 11:16:31 2021 +0000
tree94ce4b852041c4166603b0369497a8b16a54d872
parent1233b55e1e4b6df25b128e5ecddc8ff24e4289d6 [diff]
parentad986df778da17d9c168a42da255f1efd4665bd6 [diff]
[automerger skipped] Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6 am: ad986df778 -s ours

am skip reason: skip tag Change-Id Idef6f2fd89116490c43427bba55202f46377a83d with SHA-1 9c74c744fc is already in history

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

Change-Id: Ice6855b8b985465ff1657fed66f9029fcf57a48d
tree: 94ce4b852041c4166603b0369497a8b16a54d872
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. boot/
  6. cmds/
  7. config/
  8. core/
  9. data/
  10. docs/
  11. drm/
  12. errorprone/
  13. graphics/
  14. identity/
  15. keystore/
  16. libs/
  17. location/
  18. lowpan/
  19. media/
  20. mime/
  21. mms/
  22. native/
  23. nfc-extras/
  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. BATTERY_STATS_OWNERS
  49. CleanSpec.mk
  50. framework-jarjar-rules.txt
  51. METADATA
  52. MODULE_LICENSE_APACHE2
  53. MULTIUSER_OWNERS
  54. NOTICE
  55. OWNERS
  56. OWNERS.md
  57. pathmap.mk
  58. PREUPLOAD.cfg
  59. ProtoLibraries.bp
  60. StubLibraries.bp
  61. TEST_MAPPING
  62. ZYGOTE_OWNERS