OSDN Git Service

am ed9208c3: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:28:08 +0000 (09:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 16:28:08 +0000 (09:28 -0700)
commit38f60c1ec6cb1f58ddad13a1edc6a1c4dfd2ac9c
tree38d9ca70713201a2d5a8e00f590eaf320b9c4516
parent13e4038688a419ac01e19ec9fc863a10aa6ff169
parented9208c36ae0d0d93f93412e76eb0ce7d41eed7b
am ed9208c3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ed9208c36ae0d0d93f93412e76eb0ce7d41eed7b':