OSDN Git Service

am 28b13ba1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:49:19 +0000 (07:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 16 Jun 2013 14:49:19 +0000 (07:49 -0700)
* commit '28b13ba10d8e1ce2b29ee548979ab347ec0b8e9e':


Trivial merge