Merge "Revert ProtoLog to Slog in framework.jar" into tm-dev am: 61a7196fb5 am: 4c6dc72a78 am: 2c7b85ea75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18439162 Change-Id: I5af4de5d0a34a250184e437cb8a6ddbb69d974af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: