From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 10 Aug 2012 19:40:20 +0000 (-0700)
Subject: am baa97012: am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
X-Git-Tag: android-x86-4.4-r1~457^2~305
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f09cdd928d4874f16a72ce79e3f4a0c749a9abc3;p=android-x86%2Fbuild.git

am baa97012: am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'baa97012143a8601aff04428a179446d8182a4a4':
  JZO40
---

f09cdd928d4874f16a72ce79e3f4a0c749a9abc3