Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 39d75b0e54199b928e294db6643b90535d20629e
commit39d75b0e54199b928e294db6643b90535d20629e[log] [tgz]
authorCurtis Belmonte <curtislb@google.com>Mon Nov 09 23:58:28 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Nov 09 23:58:28 2020 +0000
treeb9f6ae549939e365cdaa9cdc8e1444bd7b56835f
parent66a1743631710ef9c9b566e73d9f237095666fbd [diff]
parent57ac383a3d2596037a31daa9a26b72af696809ae [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 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: I06cd611e960f9d59c92cfb441ec52c15c4e7c43a
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