e7884d68a6
Merge commit 'd85621c938286a568b1173e7ab29f80ab93d27e1' into gingerbread-plus-aosp * commit 'd85621c938286a568b1173e7ab29f80ab93d27e1': Don't crash when extra logging is enabled.