tree eef57c43ab499db94457761ab2ed80b63fc463cc
parent 02489ac03a88c384654998b6e1f0c5884bf105b9
parent e63a7a48207cc9864f7456b7516f7aa292364108
author Aurimas Liutikas <aurimas@google.com> 1484198525 +0000
committer android-build-merger <android-build-merger@google.com> 1484198525 +0000

Merge "DO NOT MERGE. Fix builds when fullsdk is missing which is the case for stage-aosp-master" into stage-aosp-master am: 8a38b69a20  -s ours
am: e63a7a4820

Change-Id: I75e369008b5a5654093cbfb34e313f60884d4c27