OSDN Git Service

am baa97012: 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:40:20 +0000 (12:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Aug 2012 19:40:20 +0000 (12:40 -0700)
* commit 'baa97012143a8601aff04428a179446d8182a4a4':
  JZO40


Trivial merge