tree cb5c99d6f6152d180e722c0b16ec27d23509b1ab
parent ce32eb32bc2b8913eca3700e4a0599d149838c3c
parent f532e9c8e40515b19a3511cbc28eb3e73f60e877
author Alex Light <allight@google.com> 1539967710 -0700
committer android-build-merger <android-build-merger@google.com> 1539967710 -0700

Merge "Change commonRef to avoid using jweak" am: aa69a6b77e
am: f532e9c8e4

Change-Id: Ie3b37a5019960ae5a03dde7963fe3f8787371328