Google Git
Sign in
android / platform / frameworks / base / 0a771d1712c49b1d5bb2058def38a4a6b6d5dc2c
commit0a771d1712c49b1d5bb2058def38a4a6b6d5dc2c[log] [tgz]
authorVishnu Nair <vishnun@google.com>Mon Feb 07 23:57:09 2022 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Feb 07 23:57:09 2022 +0000
treeca94362035b732195a55fd4c1096b269144d440f
parent0f98ad1c303cc705f770c23e0517d13c0f772e5c [diff]
parent97e9e5f475116853ebc5ebbffd4e4092a55b974b [diff]
[automerger skipped] Merge changes from topic "toast-security-fix-sc-dev" into sc-dev am: 799f0a7f66 am: 97e9e5f475 -s ours

am skip reason: Merged-In I316b76b685ca5030fd8aa91283555efcce4d6994 with SHA-1 3b8aa02ba5 is already in history

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

Change-Id: I071a102d5196098106355c771901db3d32dc9c3f
tree: ca94362035b732195a55fd4c1096b269144d440f
  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. TestProtoLibraries.bp
  63. ZYGOTE_OWNERS