OSDN Git Service

am e29b9ae4: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 May 2013 19:59:38 +0000 (12:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 May 2013 19:59:38 +0000 (12:59 -0700)
* commit 'e29b9ae47bc21bb582dd6a0fb57796c09d3c8722':


Trivial merge