OSDN Git Service

am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 19:36:39 +0000 (12:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Aug 2012 19:36:39 +0000 (12:36 -0700)
commitbaa97012143a8601aff04428a179446d8182a4a4
treee989c110242df97a003d67e34eb1890da23085d6
parentc2872a62402c7e075a1f9cfba04c4e4d65c30c8f
parentd4c6a2edde97a7709086e9a3b7ecb028cecd9bfb
am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'd4c6a2edde97a7709086e9a3b7ecb028cecd9bfb':
  JZO40