tree 2ab779088355bc4ac4d0480dc4e87cc56266537c
parent 874c320c6f1ce3675e461c6b145a8eed83b33449
parent aad073b8b8c36f0faa085677627ab0de97948fff
author Elliott Hughes <enh@google.com> 1494548084 +0000
committer android-build-merger <android-build-merger@google.com> 1494548084 +0000

Merge "Run bionic/libc/tools/genversion-scripts.py" am: 23672d30e2
am: aad073b8b8

Change-Id: I9e120303d8e60b1b9b058514f167e4e42e36cc8c