| commit | 4b7eab4f563bc1bcae07057b4bd11fabd2fb524b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 10 19:47:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 19:47:44 2020 +0000 |
| tree | 6a7b4d3a1c95136cf51932f87b1ad4aaf20d0d67 | |
| parent | af629c41379bdd4e77430cd4e5f9a3cb5815bf31 [diff] | |
| parent | ade1c2bf2b9344259ec1aadb0168b3b02a73a92e [diff] |
[automerger skipped] Merge history of system/core/libstat/{socket,pull} am: ccf7006dc3 -s ours am: 9cfd1aa090 -s ours am: ade1c2bf2b -s ours
am skip reason: Change-Id I35d206ae06d502fffee89de74123a0ea70230ba0 with SHA-1 d7550c2723 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/1523298
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4733374922256f2987789c8f951bb1fb63ae354e