OSDN Git Service

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


Trivial merge