tree 2da4fce9d799c4ab4ef43b5df99b698a2ccf355f
parent b0b9af6f199c88592625ecb25174ba2c60a6888b
parent 597eb7f87efd340347bf2f3bba79c6933d99c8a0
author Tobias Thierer <tobiast@google.com> 1532107186 -0700
committer android-build-merger <android-build-merger@google.com> 1532107186 -0700

Merge "Use StrictJarManifest.ATTRIBUTE_NAME_NAME instead of Attributes.Name.NAME." am: 2dc5a42743
am: 597eb7f87e

Change-Id: Ie91c49d41f0c5fef015180da208f1a626952d606