OSDN Git Service

am f09cdd92: (-s ours) am baa97012: am d4c6a2ed: (-s ours) Reconcile with jb-mr0...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 19:42:16 +0000 (12:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Aug 2012 19:42:16 +0000 (12:42 -0700)
* commit 'f09cdd928d4874f16a72ce79e3f4a0c749a9abc3':
  JZO40


Trivial merge