[automerger skipped] Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests"

am: 375d9618f6  -s ours

Change-Id: Ia4fdb2bfd96ed04a854cd1769b4a2755d2d4fae8
This commit is contained in:
Colin Cross
2018-06-20 16:36:47 -07:00
committed by android-build-merger

Diff Content Not Available