Restore AOSP-style version numbers - DO NOT MERGE
1 file changed