tree 84c3bd0559eb2e41367bc72dc5842af6483d7b52
parent 3e1cd845e6f2db3125647f025356ce334a4e7263
parent fd435b5026913c44bece6f5ab14ce8afc6cd5fb8
author Adam Lesinski <adamlesinski@google.com> 1471135714 +0000
committer android-build-merger <android-build-merger@google.com> 1471135714 +0000

Merge "SamplingTimer: Fix issue with summary recording too much" into nyc-mr1-dev am: 8aacc3cf98 am: 16b8cc1eda
am: fd435b5026

Change-Id: I48bfb57abde75e7ef3883a710c4c6a5974b210aa