tree 83c45888cd9b486039052c99e8b555a8a9f86205
parent 6d616e69c42fc7e692ca3770c6a1f3d573deb6ce
parent 33d1c4edbc4e3a3d770a708e4bcfed56be56825f
author Marco Nelissen <marcone@google.com> 1488859852 +0000
committer android-build-merger <android-build-merger@google.com> 1488859852 +0000

Merge "Guard against sample time overflow" am: 7639616e4f am: 5dfade5b09
am: 33d1c4edbc

Change-Id: I7cb4bfd82c1882d53177aba82dd7849c21692dd6