tree 272f82b1552677de08706c000344c221c701c095
parent b447b7d107897cc1227d90913eae5133fa7ff5cf
parent 4e56a0e44a38a0ebddec2dc87b0f68cea57fc546
author Sean Stout <sstout@google.com> 1555395977 -0700
committer android-build-merger <android-build-merger@google.com> 1555395977 -0700

Merge "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API" into qt-dev am: a0d852907d
am: 4e56a0e44a

Change-Id: Ib62bcd24790943ad0724106a4dcea5afbc837fdd