tree 74feed31f8fb623dcfc2e408374d5dab61144ff8
parent a5c0ccf668055485789e441811570028b644fd53
parent cb30bb4b74a6d3f50c138c5ed79be8021c8c2280
author Yifan Hong <elsk@google.com> 1564443951 -0700
committer android-build-merger <android-build-merger@google.com> 1564443951 -0700

[automerger skipped] HalManifest xsd: fix attributes am: 775b8c3131 -s ours
am: cb30bb4b74 -s ours
am skip reason: change_id I637a587684b57b310e8d0a2c2875f1aee605a70c with SHA1 a5c0ccf668 is in history

Change-Id: I2d986e00b9d77bcc35c4dd30f1708784bfd9cc75