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

am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.

* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
  Merge e57aa434 from honeycomb-mr1. do not merge.
---

2bbb5c35c1c0c6c274229c3c9c7f40f95456a91d