OSDN Git Service

am aecc1998: (-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:41 +0000 (12:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 May 2013 19:59:41 +0000 (12:59 -0700)
* commit 'aecc1998647fc33822a8e5c55673c8f45ec466e7':


Trivial merge