Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 8549538e5bd2f7ac5f968887359dca513d3aa62a
commit8549538e5bd2f7ac5f968887359dca513d3aa62a[log] [tgz]
authorCurtis Belmonte <curtislb@google.com>Tue Nov 10 01:02:20 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Nov 10 01:02:20 2020 +0000
tree884167f03987e592389fcce8669d06b82d9479d1
parent5226023d2150253d506ac4cc4460ec7e80907376 [diff]
parenta89fc49936fe58819fe2be48200b58947ba61b9c [diff]
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-mr1-dev am: 1a673296ae -s ours am: 12e7baaddc -s ours am: 50472c1db2 -s ours am: 8fcc7fb762 -s ours am: 57ac383a3d -s ours am: 39d75b0e54 -s ours am: a89fc49936 -s ours

am skip reason: Change-Id If5cdf8ffaf3aa7d8a1ac81272e3bfb2cc7cdddf1 with SHA-1 d4774f9101 is in history

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

Change-Id: I5c94b80db5fd9f91889aa6dc475ffb91b060accd
tree: 884167f03987e592389fcce8669d06b82d9479d1
  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. CleanSpec.mk
  48. framework-jarjar-rules.txt
  49. METADATA
  50. MODULE_LICENSE_APACHE2
  51. NOTICE
  52. pathmap.mk
  53. PREUPLOAD.cfg
  54. StubLibraries.bp
  55. TEST_MAPPING