OSDN Git Service

am 85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"
authorBill Yi <byi@google.com>
Fri, 20 Jun 2014 18:29:59 +0000 (18:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Jun 2014 18:29:59 +0000 (18:29 +0000)
commit9c6235777e89b54fd933c187ffa1d9184086a787
tree03f3803b118b9c7d178a9c13672e2f38baaa03b7
parent318c8e76ee8f47fb9f077e419713cf4dbb454788
parent85fe14395b8bbc5b44383c1705f60bfdc12c61cf
am 85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"

* commit '85fe14395b8bbc5b44383c1705f60bfdc12c61cf':
  Restore AOSP-style version numbers - DO NOT MERGE