OSDN Git Service

am 0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Jul 2013 15:08:09 +0000 (08:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jul 2013 15:08:09 +0000 (08:08 -0700)
commitcf5dd91ec796abad8f6464687439c47f5a86f3df
treeeffa22031f55a3260979ca2776a36e59c55fc634
parentceb1f0af56b5ff1f546438ec27321929956c705f
parent0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c
am 0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c':