tree 8540d34082192f095bf2085a6a7d3a29e09563fa
parent 23e27db576d06761363365494327baf062468a66
parent 68f2c85354acd1d758f5aa2349b83b620a7ba1dd
author yaochen <yaochen@google.com> 1510773972 +0000
committer android-build-merger <android-build-merger@google.com> 1510773972 +0000

Merge changes from topic "stats_log"
am: 68f2c85354

Change-Id: I2dce867c04ea61a05b32063f321414f459cbe26c