| commit | 3caeffac54f4aacecab63f709463885c5afe367d | [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 | ef9e34008ce99b4f4cacb6c4fcdd979651a52ec0 | |
| parent | 5bc3addb453ba1daad366862a24be654a06ff447 [diff] | |
| parent | 779a6e41d7e5cdb27b802551249257d600dc2d27 [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.