tree 899d6f67c8a266cc5149c82b4ba71d0d7cb19711
parent f4bd556cea2019edb9deb7e2c3f9ee314baa4288
parent 4272f44f3fcd6e4c984d66a6239252abd65cbbf6
author Lucas Dupin <dupin@google.com> 1516160186 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516160186 +0000

Merge "Add battery to AOD"