OSDN Git Service

am bd98fec2: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Oct 2012 15:20:54 +0000 (08:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Oct 2012 15:20:54 +0000 (08:20 -0700)
* commit 'bd98fec2ab633eb81102b3424ba258b24876e887':


Trivial merge