OSDN Git Service

am 2ca8825a: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Jun 2013 18:50:02 +0000 (11:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Jun 2013 18:50:02 +0000 (11:50 -0700)
* commit '2ca8825aff762b5657f4f0b661bf20c7e2957c60':
  JSR82B


Trivial merge