tree 13aa2e2e14e7eaf87f7c9a7f225027c1961d56ea
parent 86a5ca2c1466a2d0c5d9f95d6fc03ae1edf00a32
parent 9218917ebbf5a3e10e49d06bf94ee73d71ff7908
author Baligh Uddin <baligh@google.com> 1608047014 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608047014 +0000

[automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" into stage-aosp-master am: 9218917ebb -s ours

am skip reason: Change-Id I30180ec8e75f6c619dbe8492e74324d2e38d6a3f with SHA-1 4e1fe29cf0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf14cbc454ff3fdfa4ba2fd483d5a6b5f6d0e1f0