tree 5a88c3153bf432c28ae3f3bf6b09db5656655221
parent 9005dafb7440db3130c03bfdacf56759c5a1b606
parent f3fa150b77bd68919dbfff91de5ab3a1a9213460
author Dimitry Ivanov <dimitry@google.com> 1542108738 -0800
committer android-build-merger <android-build-merger@google.com> 1542108738 -0800

Merge "Apply version-script to libandroid library." am: dbacdb242b am: 5291def66d
am: f3fa150b77

Change-Id: I3f0673ce51177295fbd8985eea26888501548bcc