OSDN Git Service

Merge "Convert framework.jar to Android.bp" am: 3d16ff7a4a -s ours am: 910fbf6562...
authorColin Cross <ccross@android.com>
Mon, 4 Dec 2017 20:26:38 +0000 (20:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Dec 2017 20:26:38 +0000 (20:26 +0000)
commitc33825481f6298e3717ff0a70f6b435181689606
tree015272866b695891df3d0c6cb328f675929eaded
parent9e0aba647c81a174ec5e80a902fa3748b0202bc3
parenta691868a422999dd7938c6d19dc464185e9ab5fe
Merge "Convert framework.jar to Android.bp" am: 3d16ff7a4a  -s ours am: 910fbf6562  -s ours
am: a691868a42  -s ours

Change-Id: I273e0a244141012b8fe15919ae445e815caea106