tree 553579c7e9532f5863f031795024971d4d89caf0
parent f53c7a2ae5d2ef0a36d3021305328c78fc75d44d
parent 50f29d8ecf5122521304a8c3149b5053d3953a03
author Jordan Liu <jminjie@google.com> 1530904549 -0700
committer android-build-merger <android-build-merger@google.com> 1530904549 -0700

Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7
am: 50f29d8ecf

Change-Id: Ia5ee66c5f99ddd0700bc971ba895c73594e9a517