[go: nahoru, domu]
Google Git
Sign in
android / platform / frameworks / base / 66a1743631710ef9c9b566e73d9f237095666fbd
commit66a1743631710ef9c9b566e73d9f237095666fbd[log] [tgz]
authorCurtis Belmonte <curtislb@google.com>Mon Nov 09 23:32:04 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Nov 09 23:32:04 2020 +0000
treeb9f6ae549939e365cdaa9cdc8e1444bd7b56835f
parent292c75a05a57b8f2021167ca4ffc165a45e11348 [diff]
parenta82898ba3468afbc3fdfb38cb49250afcf3a0d93 [diff]
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a97 -s ours am: 8df04e3975 -s ours am: dc9d907b8f -s ours am: a82898ba34 -s ours

am skip reason: Change-Id Iee6af379515385777984da55048c1efd9339ed88 with SHA-1 be924dac10 is in history

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

Change-Id: Ieff512e47fafd18db45bda0a651e8b096e0460fa
tree: b9f6ae549939e365cdaa9cdc8e1444bd7b56835f
  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. MODULE_LICENSE_APACHE2
  51. NOTICE
  52. pathmap.mk
  53. PREUPLOAD.cfg
  54. StubLibraries.bp
  55. TEST_MAPPING