OSDN Git Service

am 11f5f984: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 19:02:15 +0000 (12:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Jun 2013 19:02:15 +0000 (12:02 -0700)
commitfb0c7c703c51cb279265db879d4d1b922997868d
tree0a3389eec82ac36d852902f5cb809606258e45f9
parentef2cfa7ad398a6b00a831434eb522f8e037c9594
parent11f5f98482e8cf1f237488aef6fef5cea8f9a900
am 11f5f984: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '11f5f98482e8cf1f237488aef6fef5cea8f9a900':