OSDN Git Service

am bc7c3672: Merge change I6dbcafab into eclair
authorXavier Ducrohet <xav@android.com>
Wed, 14 Oct 2009 03:46:42 +0000 (20:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Oct 2009 03:46:42 +0000 (20:46 -0700)
Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-mr2

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


Trivial merge