Commit 9724fc6f authored Dec 04, 2017 by Android Build Merger (Role) Committed by Android (Google) Code Review Dec 04, 2017

Merge "Merge "Convert framework.jar to Android.bp" am: 3d16ff7a -s ours am:...

Merge "Merge "Convert framework.jar to Android.bp" am: 3d16ff7a  -s ours am: 910fbf65  -s ours am: a691868a  -s ours"

There are no changes