OSDN Git Service

am 7e1b93cb: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:33:42 +0000 (15:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jul 2013 22:33:42 +0000 (15:33 -0700)
* commit '7e1b93cbd5b647db496cc587c90a012af0529dff':
  "JSS08"


Trivial merge