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:19:01 +0000 (11:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 11:19:01 +0000 (11:19 +0000)
am: fef074ad29  -s ours

Change-Id: I9e6702dc1e7f9dd875f39cfa61bccdb9dfe117a1


Trivial merge