tree 782b2a1e7ca2d28e6f6af937477a3e3ba54a6105
parent b3b0c2644a57a8aabf41fb88bb716f141880d0a6
parent b3284a20b9d9203189c132aa699a9e4597d97b93
author David Gross <dgross@google.com> 1492109087 +0000
committer android-build-merger <android-build-merger@google.com> 1492109087 +0000

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

Change-Id: I469dfae330eb314556327b2e7681c885883f00b8