tree 6e9f1cfa5aa5fc72fb4c1b10f552cd3d2f1c8425
parent 2b541692a2a596587f4c7d93e80383dd93fad8f8
parent 55ca9ec05015493ec1bf383eba55572c109d324e
author Jordan Liu <jminjie@google.com> 1530904563 -0700
committer android-build-merger <android-build-merger@google.com> 1530904563 -0700

Merge "Type Allocation Code & Manufacturer Code" am: c42257e20e
am: 55ca9ec050

Change-Id: I39cd73bad77147f660ffe05e20c008c499c7d9fa