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)
commitf09cdd928d4874f16a72ce79e3f4a0c749a9abc3
treee989c110242df97a003d67e34eb1890da23085d6
parent8e1a87533521ac5918855256dbb92727eda1c953
parentbaa97012143a8601aff04428a179446d8182a4a4
am baa97012: am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'baa97012143a8601aff04428a179446d8182a4a4':
  JZO40