tree b916c742bcab5b99a241f0ec6e65532be5871e89
parent dfa91e470b573b702ff95b76ae8a48ef021f8cb6
parent 02dc6dbb13d0d0874336b6098fb4d4edf05a5d9e
author Android Build Merger (Role) <android-build-merger@google.com> 1461898685 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461898685 +0000

Merge "Revert "Revert "Add authority key ID to attestation certificates."" am: eabae3005e am: 44dd939d7a" into nyc-mr1-dev-plus-aosp