tree e119f667caf15d597162ee4e63bea6f460e1d070
parent 9b1d39d936d4714f5b753462bb4aeb9f170925c2
parent a018715a5230ac960f027c4fd2097e3db2bf979e
author hansson <hansson@google.com> 1519240424 +0000
committer android-build-merger <android-build-merger@google.com> 1519240424 +0000

Merge "pdk: Set LOCAL_SDK_VERSION where possible." am: dddc657d18
am: a018715a52

Change-Id: Ib1cfbb3c761ae0aec79377f70d1048e9a5648411