OSDN Git Service

am f0db5962: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 Jun 2013 14:33:32 +0000 (07:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Jun 2013 14:33:32 +0000 (07:33 -0700)
* commit 'f0db59627543ef0ae918039870de5583f5e475c9':
  "JSR78"


Trivial merge