Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 333f5c979bc4f12527b4187c698724a843059168
commit333f5c979bc4f12527b4187c698724a843059168[log] [tgz]
authorTreeHugger Robot <treehugger-gerrit@google.com>Fri Jun 11 10:59:52 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Jun 11 10:59:52 2021 +0000
tree9c3dadf8bc2a52edb01e6da7f9e7b6e3a2a78306
parent51855b1f12b1d87e7625c40486c798f36e6d6509 [diff]
parentaff0172222e6958b837744dc76e61df685fd58b2 [diff]
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -s ours

am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: Ibb0187f711beb849cf41682cd3bed3ac5050696c
tree: 9c3dadf8bc2a52edb01e6da7f9e7b6e3a2a78306
  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