tree 782b2a1e7ca2d28e6f6af937477a3e3ba54a6105
parent de9ff4cc6e076558d34f35f1bf920d983a842fe1
parent 70925e3bf6595a9d05d7e5271b918b3245a6ddb1
author David Gross <dgross@google.com> 1492109443 +0000
committer android-build-merger <android-build-merger@google.com> 1492109443 +0000

Merge "Insert a new `versionInfo` field into the `.rs.info` symbol" am: c29bfc44f2 am: b3284a20b9
am: 70925e3bf6

Change-Id: I9b386afd9d9b24f1a352519280125778495afa3d