tree 3c93c6275a49467cd808efcc827c58d05c219203
parent 0d72d87e161ab2e0573790cf2fed8680f3cdbb9b
parent 37de8a4f3d93cf8847874f54c5ee3650867717c2
author Alan Viverette <alanv@google.com> 1483722044 +0000
committer android-build-merger <android-build-merger@google.com> 1483722044 +0000

Merge "DO NOT MERGE Revert "Add support lib version meta-data to AndroidManifest.xml"" into nyc-support-25.1-dev am: 8a39c793b6  -s ours
am: 37de8a4f3d  -s ours

Change-Id: I7440deeb99efb76d65698c2b6162336456c5cf84