From: Xavier Ducrohet <xav@android.com>
Date: Mon, 23 May 2011 16:52:55 +0000 (-0700)
Subject: am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
X-Git-Tag: android-x86-4.4-r1~3915^2~2^2~82
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7e7703528ce32e00393cbb325dc2d06100b75a17;p=android-x86%2Fframeworks-native.git

am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.

* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
  Merge e57aa434 from honeycomb-mr1. do not merge.
---

7e7703528ce32e00393cbb325dc2d06100b75a17