tree bd466501a9e1c0cc834d182d90588b39a6307d9c
parent ffa1cc020d055d7f265c2ca090b57165ec5799b1
parent 2228f62d03f5e663456635134014adb4c42a98ca
author Colin Cross <ccross@android.com> 1512023756 +0000
committer android-build-merger <android-build-merger@google.com> 1512023756 +0000

Merge "Copy soong java prebuilts to classes-pre-proguard.jar" am: b8d6ac2150
am: 2228f62d03

Change-Id: I400fe53a51a7af3ac1b2913868f7abfa43d838b9