am 3492be80: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT...
am 3492be80: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE" into stage-aosp-master
* commit '3492be80':
Restore AOSP-style version numbers - DO NOT MERGE