| commit | 2ae3dd2ce1fb1afa60cf99b9b667445bf92010b4 | [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 | 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f | |
| parent | df8ae2a6335b24ed6f67405f4a1b4a71b4588572 [diff] | |
| parent | 8950fabfbc74652f511125ccd76dd5fb405871f4 [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.