OSDN Git Service

am edf16ad6: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:10:21 +0000 (08:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 May 2013 15:10:21 +0000 (08:10 -0700)
* commit 'edf16ad654cbebd53ef7be0c585e0f1937340f06':


Trivial merge