tree ad36b7c0d8b17054afeb4a517eb3b06adaa60f18
parent dbe9b4c67e4fa183ba61f4d15fc6d7f5676cd699
parent 1c5eb90308deadad49ea66135d4568640e7a0054
author Colin Cross <ccross@android.com> 1541022211 -0700
committer android-build-merger <android-build-merger@google.com> 1541022211 -0700

[automerger skipped] Merge "Convert statsd and incidentd to Android.bp" am: d7fa414834 am: e869320b3f
am: 1c5eb90308  -s ours

Change-Id: Ia8f87b1b2295515863d414193fcb9ba029b64f25