OSDN Git Service

am 2b366f1e: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Dec 2012 19:56:58 +0000 (11:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Dec 2012 19:56:58 +0000 (11:56 -0800)
* commit '2b366f1eab4d723a9bf06c616b2d23c262164939':


Trivial merge