OSDN Git Service

am ee76e181: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Nov 2012 17:49:35 +0000 (09:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Nov 2012 17:49:35 +0000 (09:49 -0800)
* commit 'ee76e18125438183d7e7bfa5e2b10172fcf565ec':


Trivial merge