From: Jean-Baptiste Queru <jbq@google.com>
Date: Mon, 11 Mar 2013 20:13:28 +0000 (-0700)
Subject: am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile... 
X-Git-Tag: android-x86-4.4-r1~23^2~1^2^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c5604b08;p=android-x86%2Fframeworks-av.git

am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0fe40641db3759088edc1bc7f0182556d77bede6':
---

c5604b081b6cac558ed94dce88dedf1a467185b7