tree 7cd5a659524c3882216f872c95549bc43fe719a9
parent 37e7cc53471144c95ed1a71f82c63561c2f55b25
parent ccc24468630fac895c7e02a5794d4cb553d6e0b7
author Ken Mixter <kmixter@chromium.org> 1291149604 -0800
committer Ken Mixter <kmixter@chromium.org> 1291155373 -0800

Merge remote branch 'cros/upstream' into merge-branch.
Brings us up to google-breakpad's 734.

Conflicts resolved:
	src/common/linux/dump_symbols.cc
	src/common/linux/dump_symbols.h
	src/processor/minidump_dump.cc
	src/tools/linux/dump_syms/dump_syms.cc
	src/tools/linux/symupload/minidump_upload.cc
	src/tools/linux/symupload/sym_upload.cc

BUG=9281
TEST=
1) emerge with host, x86-generic, arm-generic
2) run UserCrash like 40 times
3) run cros_generate_breakpad_symbols on full checkout without obvious errors
4) ran FEATURES=test emerge-x86-generic google-breakpad

Change-Id: I4c31862d26bd744eda2064f3175cec6adb4c1388