OSDN Git Service

am 7b2f0b93: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 May 2013 16:06:31 +0000 (09:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 May 2013 16:06:31 +0000 (09:06 -0700)
* commit '7b2f0b93fc5f6299511125e509560ac49f90e79a':


Trivial merge