OSDN Git Service

am 42261cac: (-s ours) am 7906ee68: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:54:34 +0000 (07:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Apr 2013 14:54:34 +0000 (07:54 -0700)
commitb20376a7dd77ccfda2a2a41423c8894e19bdf718
treea64dd7d8d5111e2c8e4fb7eb5b7be0cb4d178efc
parent5cdef628d9b13f508df9412a8476960590b8d976
parent42261cac62383adf1a45c7a4077e61ce56665568
am 42261cac: (-s ours) am 7906ee68: Reconcile with jb-mr2-release - do not merge

* commit '42261cac62383adf1a45c7a4077e61ce56665568':