tree 120f52be66400f528a4b37635edf34733be24fc8
parent 85056fca4921f0ca8e30bce67cffe6952b934de8
parent e72a1eb1eb87e11eca3a7edea6185b5e0bf18f92
author Baligh Uddin <baligh@google.com> 1606286800 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606286800 +0000

Merge "Revert^2 "Delete atoms.proto from statsd"" am: e72a1eb1eb

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

Change-Id: I2a9ff1e9a4eb1022a25b5a959a68f0f28ecf770f