From: Xavier Ducrohet <xav@android.com>
Date: Wed, 14 Oct 2009 03:46:42 +0000 (-0700)
Subject: am bc7c3672: Merge change I6dbcafab into eclair
X-Git-Tag: android-x86-2.2~251^2~95
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=063eb68a62ce65414e448cfdcd1356c0c73dede2;p=android-x86%2Fsdk.git

am bc7c3672: Merge change I6dbcafab into eclair

Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-mr2

* commit 'bc7c36728c353102ff8b0280b403cf348f47581e':
  Fix NPE in the parsing of property file.
---

063eb68a62ce65414e448cfdcd1356c0c73dede2