tree 5f29b67c1c98cea2f951effd6604e9bea55208d7
parent 6593f7c9643c6b082c7f26b29d7406dfc678f570
parent 39e245b22539b4350ce506b12ba0ca3985568baf
author Tom Cherry <tomcherry@google.com> 1595888082 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595888082 +0000

[automerger skipped] Merge "Delete unused imports in Statsd" am: 9e9ce9f9ef am: f2d7b77e42 -s ours am: 39e245b225 -s ours

am skip reason: Change-Id I80203756d714bf123978d26bbe81351a1abdc967 with SHA-1 cabd127c19 is in history

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

Change-Id: I997d1676007b4376a107a3ca6c8cef6cfbb05318