tree e1ac5921412e6d88a4e4fabc6974831dd5c8dd55
parent 656c1105f6a614c29b0d5e33c172eeb677aa0d63
parent af8e230787cf178f5a0d01e8d8bebba9e967817f
author Julius D'souza <jdsouza@google.com> 1498563000 +0000
committer android-build-merger <android-build-merger@google.com> 1498563000 +0000

Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am: fef074ad29  -s ours am: 8af046a55e  -s ours
am: af8e230787

Change-Id: I26adc1561e90d9eeca58bb130c2c137e6fea9f40