OSDN Git Service

am bc7c3672: Merge change I6dbcafab into eclair
authorXavier Ducrohet <xav@android.com>
Wed, 14 Oct 2009 03:47:17 +0000 (20:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Oct 2009 03:47:17 +0000 (20:47 -0700)
commitfe789d5e6be81b6188ec761ac553252f1683838e
tree8162cdb02e566d2dc7ab0d38e7693870f2f594dd
parent498483e09e3440c589107eadffdd1f17164a002b
parentece803c076b9888d27f8e77f775e9070a3542a05
am bc7c3672: Merge change I6dbcafab into eclair

Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-plus-aosp

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