tree 48c20bf19a292ee0a8100aa7a1e521b7dd325cbf
parent 141866474e9c4d543d5d2fba35064887fa122464
parent 2272f08724f287b640f468cfb2357148fca7a5e8
author Evan Laird <evanlaird@google.com> 1529620150 -0700
committer android-build-merger <android-build-merger@google.com> 1529620150 -0700

Merge "Add config to disallow the battery % option" into pi-dev am: a063da83f1
am: 2272f08724

Change-Id: I4de78fe137ed23012f13447d9460bfe19916df33