OSDN Git Service

am ac022d92: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:40:11 +0000 (12:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:40:11 +0000 (12:40 -0800)
* commit 'ac022d9229eec51acbd04878067eba0c705e427d':


Trivial merge