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)
* commit 'd4c6a2edde97a7709086e9a3b7ecb028cecd9bfb':
  JZO40


Trivial merge