tree ddf97dbcce71b340a07eba0cdcc2bb74daabf967
parent d66179fac873eb1ba597a08746854cbf273a230b
parent 5dfade5b09d9af90f8ebcbf9bd426f5fba417dc3
author Marco Nelissen <marcone@google.com> 1488859699 +0000
committer android-build-merger <android-build-merger@google.com> 1488859699 +0000

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

Change-Id: Ied4068d43807308aaf74dbe7e9aca30359c2b68e