OSDN Git Service

am 2ad5a49a: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:59:17 +0000 (05:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 12:59:17 +0000 (05:59 -0700)
commitf45ffab037ff8ea5dc0ee8cd91c554baba77b249
treee5fadb2f26899bc340141accfe01cb9fff7cd21c
parent60d87c5af8e4bfe07b3bba3d6036dd6321eb9bf1
parentc8c5ad6a323476b85adba337574b72d38649c8aa
am 2ad5a49a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6':