tree 6c362a286a5addd23eac82a95156850e98996811
parent 554c8c2460221390549717c1eaeaf4a525d13f89
parent 1f7b24f6e36e902a202641e378fb7f9167a5aa81
author Colin Cross <ccross@android.com> 1481071311 +0000
committer android-build-merger <android-build-merger@google.com> 1481071311 +0000

Merge "Generate Version.inc from version.py"
am: 1f7b24f6e3

Change-Id: I2ddb3177110a1cdec8f7d9abc646fd70eb15b73c