| commit | 8950fabfbc74652f511125ccd76dd5fb405871f4 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Oct 07 17:48:46 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 07 17:48:46 2010 -0700 |
| tree | 6e184260a05d400c6c5ec20eb741d426dbbf8e6f | |
| parent | ddfbafa7863d58d390772bafa3db1df255c8b8f9 [diff] | |
| parent | 0a95ad1e3b57e6abdce27f7908c384f4ea9c99f7 [diff] |
am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled. Merge commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f' into gingerbread * commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f': Do not merge.