tree 2e3ae7a8664e65320e56321684138f6dabbe5c5d
parent 152cc626270945a6d1e1f6d500403243f0576867
parent 24d0f84bf165c28f027d74774a169f551eede04e
author Tomasz Wasilczyk <twasilczyk@google.com> 1502153364 +0000
committer android-build-merger <android-build-merger@google.com> 1502153364 +0000

Merge "Change VENDOR program types to range." into oc-mr1-dev am: ecacb9850c
am: 24d0f84bf1

Change-Id: Idc444801a6da7c19cfa947db07d84f24162a52c4