tree 368d6ef41f88ea13fab09441370abde1b0ac7758
parent e78e46a9ecc9a44cd521b208e6f9cd558f7f3688
parent b6ad1e2bebb247bf935563d56b5b7c40445b768c
author Ben Chan <benchan@chromium.org> 1403671260 -0700
committer Ben Chan <benchan@chromium.org> 1403671281 -0700

Merge branch 'merge-debugd-rewrite' into merge-debugd

BUG=chromium:380202

Change-Id: I3557568f33cd9434ab7cbafe507e49bf250b55bf