tree 2b7f22625f1c0ea668b4a5f784e1656c31380b14
parent 26861dd5c2cdb207257dd88f6f0b88b71bb8f008
parent 01da3bb250c216a2e95282ab53b77a8e771bdb66
author James Hawkins <jhawkins@google.com> 1469738742 +0000
committer android-build-merger <android-build-merger@google.com> 1469738742 +0000

Merge \\\\"bootstat: Fix a potential unhandled exception for malformed input.\\\\" am: eafeb75c49 am: c45ec807ff am: c019082c26
am: 01da3bb250

Change-Id: Idf127e7d741690849d5e8ce528a7fa17d77b8775