tree 454282f4399fd1707e844d439b24d3a0c47be085
parent 71f46fdf29b7ebb87a510a637209a1e0f0cffa6f
parent 86f3f9c0c8d7b1201c1576337f0f8a206617223c
author Alistair Strachan <astrachan@google.com> 1535418088 -0700
committer android-build-merger <android-build-merger@google.com> 1535418088 -0700

Merge "Add Android.bp to build U-Boot's mkimage." am: b8d2f2183e am: 83ee47160f
am: 86f3f9c0c8

Change-Id: Iddd73fed074554cceda2a5d3f8ec40937e5b6122