tree 699745f866ab50a2483f32382767e5f933dc3d52
parent 6b77ef94805dcfb110094a4823a13744a8e9cc27
parent 3fdc2f2be80071eb510ad5e33e9f967d7e946b0f
author Sami Tolvanen <samitolvanen@google.com> 1427356550 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427356550 +0000

am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for verity metadata"

* commit '3fdc2f2be80071eb510ad5e33e9f967d7e946b0f':
  Use structured format for verity metadata