tree 51f80a95f2655b827e9a5ad9b0567b5bb381ab4e
parent 01cc4601fb37fd55c4a072d88702072cf5ce6185
parent 3704c266314f7b894e4601454bb331a98f63074d
author Paul Duffin <paulduffin@google.com> 1561638134 -0700
committer android-build-merger <android-build-merger@google.com> 1561638134 -0700

Merge "core_current does not include framework libraries" am: bf46d96c60
am: 3704c26631

Change-Id: Ia24a9ceef1cf09fc61f1073e91acfbf7d2d48749