OSDN Git Service

am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Jul 2013 17:17:25 +0000 (10:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jul 2013 17:17:25 +0000 (10:17 -0700)
commit1c0e7a9cb2ca53c662e853421d7fa08ca5ad8538
treeeffa22031f55a3260979ca2776a36e59c55fc634
parentcf5dd91ec796abad8f6464687439c47f5a86f3df
parent1bb59258458350af518170558120783bc2f9e61d
am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '1bb59258458350af518170558120783bc2f9e61d':