tree 0e541942013aaf463ed1b41c52546f10df640892
parent 12d0b2d65e17f8186a791305ae1f57aa7f5bdae0
parent 5b57c6bbf5a3b156129b5ba03ed9d5f9f3adc632
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582926852 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582926852 +0000

[automerger skipped] hikey: Sort manifest.xml entries am: 82dce710e1 am: bbb5c4c78a -s ours am: 30a6a809b9 am: 5b57c6bbf5

Change-Id: I34d24a3f61109a305875c0d2a5c23989fe34f255