tree 6c0ed38943137f096b61d6f93ca7f95e35fa805c
parent 8c2440635573940eb6371e18cf4abb69b733f28c
parent 38b92986dfc42fe8a81365e5c51498d2959865f9
author Yao Chen <yaochen@google.com> 1528408423 -0700
committer android-build-merger <android-build-merger@google.com> 1528408423 -0700

Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev
am: 38b92986df

Change-Id: Ia90bed14900a2c944165aefe00661d3979c08aed