| commit | 779a6e41d7e5cdb27b802551249257d600dc2d27 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Oct 07 17:52:15 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 07 17:52:15 2010 -0700 |
| tree | cb3522b7577d684c0e61148a7fa2278a90ac740f | |
| parent | 0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124 [diff] | |
| parent | eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513 [diff] |
am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled. Merge commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513' into gingerbread-plus-aosp * commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513': Do not merge.