OSDN Git Service

Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding...
authorJulius D'souza <jdsouza@google.com>
Tue, 27 Jun 2017 11:41:36 +0000 (11:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 11:41:36 +0000 (11:41 +0000)
commitd4cb6ef2a47b4d5ae8fb04d87533d6a64476efde
tree93449db8ad7a627ef96dc121e4421c8e938b9626
parent2d6ef698950e81567eb340d91e07b2befdf9d19a
parent9fa68b6bc587ec464395f9c3dff2b3dce6eccbd1
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: fe26fadf97
am: 9fa68b6bc5

Change-Id: Ifabc90ad9a4b4b4b6bea64ba1f57bfa5ca1197ca