tree 5b7761d93fde39295e535eab5b10bad4e7338c88
parent e214ff00eada0035ed0cae33856846be1c1158ec
parent 135c4760fddc7809ea5f7e9d58bc3f4b3a076875
author Roshan Pius <rpius@google.com> 1464220676 +0000
committer android-build-merger <android-build-merger@google.com> 1464220676 +0000

Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev
am: 135c4760fd

* commit '135c4760fddc7809ea5f7e9d58bc3f4b3a076875':
  BatteryStats: Allow for sample errors in wlan stats

Change-Id: I23e117ccaa78cb7e6a3a0b9df682ec459391fb34