OSDN Git Service

Merge "Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for...
authorJulius D'souza <jdsouza@google.com>
Tue, 27 Jun 2017 11:43:22 +0000 (11:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 11:43:22 +0000 (11:43 +0000)
commit8ba0d70314919f4093ccd349a5eecc392d346c9d
tree93449db8ad7a627ef96dc121e4421c8e938b9626
parentd4cb6ef2a47b4d5ae8fb04d87533d6a64476efde
parent3b7277efebe87c890800f655df19e5d5eb6af9a4
Merge "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 am: 889d326eda" into oc-dr1-dev-plus-aosp
am: 3b7277efeb

Change-Id: I082d86f8e65b339f4dd9d7b62b32a8622b86a72f