OSDN Git Service

am 6c19776e: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Aug 2012 22:09:11 +0000 (15:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Aug 2012 22:09:11 +0000 (15:09 -0700)
* commit '6c19776e9c8736b2f29f92e772469724cf55c1e4':


Trivial merge