tree 9bbe66b1c53076e5786fb82c1f3ba77642fc758f
parent e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc
parent 590da11a85d6e5201f3a96be7d30950e4b9178e5
author Todd Kennedy <toddke@google.com> 1440548866 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1440548866 +0000

Merge "Allow extra slop in battery stats" into mnc-dev