OSDN Git Service

am 76be17de: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Jul 2013 14:30:00 +0000 (07:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Jul 2013 14:30:00 +0000 (07:30 -0700)
commit4550fe1d40fa8784ef62d47a920c5b2c4ab38e5a
treef3e79ef96884e074d4bf811e25c6f5591ba8d914
parent7ba0850a473eee9b4f66d313f7b875dca7ab0854
parent76be17de7a7fc811da0145252855802d06d55367
am 76be17de: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '76be17de7a7fc811da0145252855802d06d55367':
  "JSS11D"
  JSS11C
  "JSS11B"