From: Steven Moreland <smoreland@google.com>
Date: Wed, 13 Mar 2019 21:20:38 +0000 (-0700)
Subject: Merge "Use jarjar rules for framework.jar." am: b70a6cbf9a
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bcf1be1c918e5b967eccc68d649bb5a6dc652752;p=android-x86%2Fframeworks-base.git

Merge "Use jarjar rules for framework.jar." am: b70a6cbf9a
am: 4382755210

Change-Id: Ib36a2c578ce37876dd1c544f471987b9a32bdc5a
---

bcf1be1c918e5b967eccc68d649bb5a6dc652752