tree 2da2249cefe105ecd0d47f3104d938cef385b4d1
parent 3c7ab93e0c22e5c1173004a39c2661cde56b42b4
parent 7856b0a99cfefc08a74b2581788fbb2de975a93e
author Dan Austin <danielaustin@google.com> 1581723980 +0000
committer Dan Austin <danielaustin@google.com> 1581723980 +0000

Merge "Parsing code for AftlDescriptor" am: 7856b0a99c

Change-Id: Ifabc3f4f70c71ffe1f65b5bf56179346b78539fd