Merge "Fix NPE when registering BatteryTrigger before first BATTERY_CHANGED broadcast" into udc-dev am: 7b45947867 am: 8591bb7124
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22190776 Change-Id: I349a15e30e4e506e2c5ba7b119f29b1710dc9f66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: