| commit | 37f35fdca099beabcef9220b809c42c7567c9749 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Oct 13 20:46:42 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 20:46:42 2009 -0700 |
| tree | 10215eedd9aacbe36587a9b23439b4a15fae89c8 | |
| parent | 60e45099aa404686c3b6d38187306fe5bb90cd8f [diff] | |
| parent | bc7c36728c353102ff8b0280b403cf348f47581e [diff] |
am bc7c3672: Merge change I6dbcafab into eclair Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-mr2 * commit 'bc7c36728c353102ff8b0280b403cf348f47581e': Fix NPE in the parsing of property file.