OSDN Git Service

am e666ccd6: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Oct 2012 14:37:18 +0000 (07:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Oct 2012 14:37:18 +0000 (07:37 -0700)
* commit 'e666ccd6ab00d689819b537e51ab9b965f8a433a':


Trivial merge