tree 71805d62889294eb0c9647ba04300141fbce0b6b
parent d8305983f2baeb1c2c294492b62da00db0706603
parent 480e125b58fe7931dca54d8c7a16aebaa3d8a546
author Anton Hansson <hansson@google.com> 1524213084 -0700
committer android-build-merger <android-build-merger@google.com> 1524213084 -0700

Merge "Add support for specifying LOCAL_SDK_LIBRARIES for prebuilts." am: 4ad0be36e3
am: 480e125b58

Change-Id: Id3b9bbf428650fba96aca05503738ec5e307005f