tree debebf74ae4caf46a4773b81d3610c964968c169
parent aca790eeb80010d9a3b4590064d526dd334efa2b
parent df7f4dd36b7ede2d178938db32d83bc15737ea1b
author David Chen <dwchen@google.com> 1522814600 -0700
committer android-build-merger <android-build-merger@google.com> 1522814600 -0700

Merge "Includes annotations with statsd reports." into pi-dev am: b61f80b42b
am: df7f4dd36b

Change-Id: Ia6fde03500c402804c701105bf0ef6b192d0e0b2