OSDN Git Service

am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:24:38 +0000 (12:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:24:38 +0000 (12:24 -0800)
* commit '78b012f5bc05706d1ce412811ccfaa9385dae0ab':


Trivial merge