| commit | bf8a532e14977a701ec6184c42d3f379bc9ca00b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 25 08:35:01 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 25 08:35:01 2020 +0000 |
| tree | fd840187fdd1b7c9fc9c9f2c938a292ba1861b4e | |
| parent | 53217a58bf7c8de088c4b9192d51633484d2ad41 [diff] | |
| parent | 53d1dec59216cdd46114f2f5956f8d7d1425ef7e [diff] |
[automerger skipped] Merge "Revert^2 "Delete atoms.proto from statsd"" am: e72a1eb1eb am: 919a826dc8 am: 53d1dec592 -s ours am skip reason: Change-Id I81a8287ed5b055e7b6547794d01e7ac897f0f022 with SHA-1 91224ea837 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510611 Change-Id: Icb39ff1d1c537b628bb9b119b8de3a27b00e9601