tree dc691058787fcca2e0035b975d266783ff3cee97
parent 4d9abae35b63c2b894e1cf1420c47d2fbbc47640
parent 8a39c793b6e228c0e8ed38c35d2b90e9ac28dd5f
author Alan Viverette <alanv@google.com> 1483721819 +0000
committer android-build-merger <android-build-merger@google.com> 1483721819 +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

Change-Id: I9cd0826ced67887cd960fb7be34f5cb5b62c109c