tree 8124a59f62ed9d3f6e9e2f94e640f72574093f4c
parent cebef998867be37f10d9db5e582d1f554490ac33
parent b0063d541bd1dba6ed20ce593a2dcf66c9082495
author Alistair Strachan <astrachan@google.com> 1558126620 -0700
committer android-build-merger <android-build-merger@google.com> 1558126620 -0700

Merge "Revert "HiKey/HiKey960: Set PRODUCT_SHIPPING_LEVEL to 29""
am: b0063d541b

Change-Id: Ie4d528606304c12196f952675af2831ef73ce5e1