tree 6e912b488b0f584869fa5b9c8437e7ee7ad265cf
parent 7fc32c4791d4646b9cdfaac9194b90911cfaa25e
parent d1721e4d042b1264f39390b4eaa054338b729d1f
author Brad Ebinger <breadley@google.com> 1597432255 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597432255 +0000

[automerger skipped] Merge "Remove IMS call logs that may leak PII" am: a8acd5c0c3 am: 8df35b81ca -s ours am: 2e111c7ec6 -s ours am: dbf8777330 -s ours am: d1721e4d04 -s ours

am skip reason: Change-Id I203b37d8e643c59d69aa26097d223fc4b3f8e332 with SHA-1 d3a397fe80 is in history

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

Change-Id: If04bfa47018bb53ccdb33159d6531b0887f588c6