OSDN Git Service

am 1565e24a: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 5 Mar 2013 15:58:52 +0000 (15:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Mar 2013 15:58:52 +0000 (15:58 +0000)
* commit '1565e24a089290994afb23682e8fcaf436043e35':
  JWQ64


Trivial merge