tree 6744161be9bf7e2f995ce05e5c4af47bb3937e68
parent a9381064619cdd7671f6e1200c3a7b9ecae3f8de
parent 1fc3d050423395ac902e89f82097baff9824d70e
author Paul Duffin <paulduffin@google.com> 1560866390 -0700
committer android-build-merger <android-build-merger@google.com> 1560866390 -0700

Merge "Use core_current instead of current and no_framework_libs:true" am: 3b1b505671 am: 3bcea82e0e
am: 1fc3d05042

Change-Id: Ia1522334e450ef6298530d9d0a860345c5ff9934