OSDN Git Service

am e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 19:17:47 +0000 (12:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Mar 2013 19:17:47 +0000 (12:17 -0700)
* commit 'e410946c085f6a6b679c5e597abf4b40dbd5ba28':


Trivial merge