OSDN Git Service

am 48cf73bd: (-s ours) Restore AOSP-style version numbers - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 21:38:35 +0000 (14:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 May 2012 21:38:35 +0000 (14:38 -0700)
* commit '48cf73bd13e3693e6e4f92dce98f3b94a4c9760d':
  Restore AOSP-style version numbers - do not merge


Trivial merge