OSDN Git Service

am b7afc4e1: 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:27:10 +0000 (12:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:27:10 +0000 (12:27 -0800)
* commit 'b7afc4e15b29d933477328d1944c3201337808c6':


Trivial merge