tree fa4eedf347f16b250f17d13bcb68fe6779b927db
parent be3c8797c81d8b2a45a38f7f15a393ef31ec4a6f
parent 15d810213de5e753608518cc314282ee2e448743
author Yifan Hong <elsk@google.com> 1571344450 -0700
committer android-build-merger <android-build-merger@google.com> 1571344450 -0700

Merge "/charger->/system/bin/charger" am: bd1e386b69 am: d439ae48e8 am: 0116446151
am: 15d810213d

Change-Id: Iad3d56be453154c15f4a9e068986c016f1288b20