OSDN Git Service

am cac59514: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 May 2013 14:27:41 +0000 (07:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 May 2013 14:27:41 +0000 (07:27 -0700)
* commit 'cac5951436f3cff8b0e634b52633b193e139c135':


Trivial merge