OSDN Git Service

am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 16:11:22 +0000 (09:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 16:11:22 +0000 (09:11 -0700)
commitdaed50bd1bd8351b852f4cd40bfe444074a5846e
treec0c1005663c89a6cd9c6b66b040b6098b9d78732
parentf3541a5f0510c1d3f214358c0b7e06470c6d4b3b
parent710aeba1ce0bf2d121aaaf659284074750b43c6e
am 710aeba1: am c53ce268: (-s ours) Reconcile with jb-release - do not merge

* commit '710aeba1ce0bf2d121aaaf659284074750b43c6e':