tree 0e541942013aaf463ed1b41c52546f10df640892
parent e603edd00641dd63ae1c0ef05ccdd009fa2744aa
parent bbb5c4c78a5bf7ceeb2679a6a3a48ac4e39b122a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582926177 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582926177 +0000

[automerger skipped] hikey: Sort manifest.xml entries am: 82dce710e1 am: bbb5c4c78a -s ours
am skip reason: skipped by user adelva

Change-Id: Ica24a3b2d60c172eb3ade665bab7a29c529b77a4