OSDN Git Service

am f0e52b64: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:22:44 +0000 (08:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 May 2013 15:22:44 +0000 (08:22 -0700)
* commit 'f0e52b648b435634d8cbcf52cac86c8dac9e4a63':


Trivial merge