tree 8286ddcf860ac6226d0f6ea1d6bbf7c1c9372312
parent 70b5da630f55d5113646a936c4ea0cea314ae9aa
parent 4cf2947d123e1428e49f026382bb6932d3d735ed
author Yifan Hong <elsk@google.com> 1571344380 -0700
committer android-build-merger <android-build-merger@google.com> 1571344380 -0700

Merge "/charger->/system/bin/charger" am: 30eb47ddf8 am: 4012a7b91f am: 77d4ae04d3
am: 4cf2947d12

Change-Id: Id28f01e9aaeda086b3ef98ee65ea22c866d7f2aa