tree 3e3922a66cc7819ca287f4067e1ac84e448d2237
parent 6047c24faea772eabe2eaad96087290f47720c75
parent a988de3baa6ca3d516ab466c33bdedd9433285fe
author Dan Willemsen <dwillemsen@google.com> 1466547037 +0000
committer android-build-merger <android-build-merger@google.com> 1466547037 +0000

Merge \\\"Clean up vendor image handling\\\" am: 4f807026e2 am: edc6ed7aa0
am: a988de3baa

Change-Id: Iba81d7bf977c85334b98f8c023b8b84c97743aa2