OSDN Git Service

am bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Jun 2013 00:02:16 +0000 (17:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jun 2013 00:02:16 +0000 (17:02 -0700)
commit7919fa2c33b1fa7f5e49b2188d671bfe519c231e
treecff1198ade127c231b63935ef66605614f79b957
parent414abc556454c2e17f7e7ec72d08d4ec798cd4df
parentbdebd4817cfe49fafedfe8f9c65930e03f9b508b
am bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'bdebd4817cfe49fafedfe8f9c65930e03f9b508b':