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