OSDN Git Service

am 9b5408ff: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:48:25 +0000 (05:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 May 2013 12:48:25 +0000 (05:48 -0700)
* commit '9b5408ffd6f6100e6a62d99983e1524c03ac1304':


Trivial merge