OSDN Git Service

Merge "Restore AOSP-style version numbers - DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Wed, 23 Sep 2015 20:54:42 +0000 (20:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 23 Sep 2015 20:54:42 +0000 (20:54 +0000)

Trivial merge