| commit | ae48bfb46db9d5d54d10167038b9869c3feb390d | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Sun Oct 10 14:20:06 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 10 14:20:06 2010 -0700 |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 | |
| parent | a51fede3c3e5b1b370f07125662d8bed5db203f5 [diff] | |
| parent | 2ae3dd2ce1fb1afa60cf99b9b667445bf92010b4 [diff] |
am 779a6e41: (-s ours) am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled. Merge commit '779a6e41d7e5cdb27b802551249257d600dc2d27' * commit '779a6e41d7e5cdb27b802551249257d600dc2d27': Do not merge.