OSDN Git Service

am cdef4045: (-s ours) Merge 5d66a07d - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Thu, 19 May 2011 22:17:21 +0000 (15:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 May 2011 22:17:21 +0000 (15:17 -0700)
* commit 'cdef404572a71ea320f59643c52143764bd590fe':
  Use actual numbers in version numbers.


Trivial merge