tree d0159481884fdcc7b7c5f81ddd39cfef5990adf1
parent b57e1180e36e44b78f45c03d98d62c22754d591c
parent caa5b4417f304dd72c7d4ed7118ff2dfa5d73de5
author Bowgo Tsai <bowgotsai@google.com> 1498268433 +0000
committer android-build-merger <android-build-merger@google.com> 1498268433 +0000

Merge "AVB: allow no metadata in the generic system.img for project Treble" am: c70bf5836c
am: caa5b4417f

Change-Id: I4859e15d3bf05c22a708761e91b2e52fbb28ca1f