[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" into...
[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" into qt-dev-plus-aosp am: 57750d13
am: 2f9380ea -s ours
am skip reason: change_id I6ee12e9914503a5b628ae6da82a396aa71dd972c with SHA1 e1d80fa4 is in history
Change-Id: I59e082fda27f41c4ca8defdbfde3e8787850d260