tree be7eb1f5575abfe3b1d037a4c0bc9a8bc7e3b351
parent 1f4e7fbe9d9116e34cc40c7b3421d87491ae9571
parent 1b9a60bae5a8cb1782e853804439aecd2ff64e32
author Isaac Chen <ycchen@google.com> 1517971344 +0000
committer android-build-merger <android-build-merger@google.com> 1517971344 +0000

Merge "Add ro.vendor.product.cpu.* to vendor/build.prop" am: b943fb63bf am: f82423f012
am: 1b9a60bae5

Change-Id: I7e03498399edafd4ad298a65bf594bab0ab1f9ed