tree a7e583ab767375b0f4b0f062bc4bab9b06a110f8
parent b1a5fef946bf5ec1c9bb59696cad9534ba72190b
parent 888916ff0ff51e35a77bd05ecbaeecb8d6e95585
author Adam Lesinski <adamlesinski@google.com> 1448050814 +0000
committer android-build-merger <android-build-merger@google.com> 1448050814 +0000

DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am: 6902052c77  -s ours
am: 888916ff0f  -s ours

* commit '888916ff0ff51e35a77bd05ecbaeecb8d6e95585':
  DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing