Google Git
Sign in
android / platform / frameworks / base / b4632bca2e330dfdea959665e86153b985da5fd5
commitb4632bca2e330dfdea959665e86153b985da5fd5[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Jan 09 19:05:30 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Jan 09 19:05:30 2020 +0000
tree9447ebad8b94584558cea8ff40f21ac450953e21
parenta46304da61f37668b5bf7de14f3b39fb388633c3 [diff]
parent6d70f9f30b3841db7a8d4b581685d17501f1754e [diff]
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: 81db8d8a83 am: 5b6d8d7724 -s ours am: d0715a9f07 -s ours am: c64d1c4649 -s ours am: b43b52a2e1 -s ours am: 6d70f9f30b -s ours
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 2e1da35b3b is in history

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