tree ff89272b42d7311b25bdbe5a21fdb0d155d61dad
parent b32a04436a5be269b98ce2e327a991c1e3bd1a57
parent 0ce7bc4332dcf1ec4b348593a94a6c5fd4dd3c0c
author Mark Salyzyn <salyzyn@google.com> 1505832302 +0000
committer android-build-merger <android-build-merger@google.com> 1505832302 +0000

Merge "bootstat: battery test fails on QC devices" am: 834e89c25a am: 808d1d4f80
am: 0ce7bc4332

Change-Id: Id03f6c713003cfbf28f6e936fba2a87ce82e9232