tree bfeaffa5adf232139f7a64234c1b6fe71482e0bc
parent c7e1c51df1fad5e632e129b5452cd2e56890a85a
parent ef784728f23de8942ee59e08c9265822242f3386
author Antoan Angelov <arangelov@google.com> 1532005918 -0700
committer android-build-merger <android-build-merger@google.com> 1532005918 -0700

Merge "Revert "Move SdkSetup.apk to vendor partition"" am: e6964f00a8 am: b0ed71b318
am: ef784728f2

Change-Id: I2db0acaf96f80e3bdce265d227a314d2775f1ce7