| commit | 0def8121aadf51be49fdeaa242abd42599e79ad3 | [log] [tgz] |
|---|---|---|
| author | Patrick Scott <phanna@android.com> | Wed Sep 22 07:18:49 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 22 07:18:49 2010 -0700 |
| tree | f92fd8706fefdc57e45eb5eae96380d8ee41afc5 | |
| parent | f42d6398b7d48808a8b96518c00529445c91c750 [diff] | |
| parent | 0b7539877138314642451877a9c641d44bb3ea3e [diff] |
am acb79542: (-s ours) am b2044da3: Do not merge: cherry-pick a fix for a npe. Merge commit 'acb795424b1e0b73fbdb69c8a93892d05f5689da' * commit 'acb795424b1e0b73fbdb69c8a93892d05f5689da': Do not merge: cherry-pick a fix for a npe.