OSDN Git Service

am 05e87d53: (-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:45:34 +0000 (07:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 16 Jun 2013 14:45:34 +0000 (07:45 -0700)
commit450655c10b9ab5aded4350c77a010c2595586ead
tree09627f85c733f844af02daed570a8c3a35ff1087
parent8147a6ddfd54079ef89f90bf2b5ed3ab6f59bbc0
parent05e87d536ed2b7cf1d68135121b630031e5d56c2
am 05e87d53: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '05e87d536ed2b7cf1d68135121b630031e5d56c2':