Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 5ba661a139d59f15be796c531ec7f2d85edc3e43
commit5ba661a139d59f15be796c531ec7f2d85edc3e43[log] [tgz]
authorCurtis Belmonte <curtislb@google.com>Tue Nov 10 01:50:34 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Nov 10 01:50:34 2020 +0000
tree32be072ff1ebac35704c3be91b35bd3123985473
parentfd72b7c39f189d5066a9775d0e109729e434a4de [diff]
parent343b7884724e1d31e57b82baf9752436dc282904 [diff]
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours am: 77579a973b -s ours am: e65d59eb5f -s ours am: 343b788472 -s ours

am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f4908f is in history

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

Change-Id: I558536c4a4941372ca56f3f48096ff8b83dda726
tree: 32be072ff1ebac35704c3be91b35bd3123985473
  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