OSDN Git Service

am 4a5fc696: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:47:46 +0000 (07:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jul 2013 14:47:46 +0000 (07:47 -0700)
commit2f8d4922029985e5b27423c44c230b764a5ac337
treeaa9710885b972f709606d705b6026dd1f8985d0e
parent52af82481c3cb37320bcc13c09a10fbe65e102c0
parent4a5fc6964313a606abd89268b8a53036b14b4ad7
am 4a5fc696: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '4a5fc6964313a606abd89268b8a53036b14b4ad7':