tree 1d5516e1cd4d8a238440d570186eb6ecefe2788e
parent 218558285d9f0b4fffb2a7f7f64109330d8580d8
parent 2e111c7ec67fe72e106b254a2b77b90d5988ca79
author Brad Ebinger <breadley@google.com> 1597430189 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597430189 +0000

[automerger skipped] Merge "Remove IMS call logs that may leak PII" am: a8acd5c0c3 am: 8df35b81ca -s ours am: 2e111c7ec6 -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: Ic582f6e6720aeeb992f66a63bc6fb068353ae4cc