OSDN Git Service

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


Trivial merge