OSDN Git Service

am a4539807: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 15:25:37 +0000 (08:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jun 2013 15:25:37 +0000 (08:25 -0700)
commitbb398a6394dfddc69559cbc62da24571af976fff
tree79f19f80ebb7978e9bab16e1d9b835849c735592
parent51ee28d24c0d3000124bd435657dbaf68c65a049
parenta45398078e4f798a34310a2d5213e07eefb14238
am a4539807: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'a45398078e4f798a34310a2d5213e07eefb14238':