tree a9cb018bf3acb1bdbc824c4aed2e0651dbf39d79
parent e6160b446d6e2f501cda14b294555d079ec9a6bd
parent 73e1dc073b24794f70b3bd99fc37ac2c20986e68
author Emily Shack <emshack@google.com> 1452118296 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1452118296 +0000

Merge "Implemented soft reset functionality to debug mode. Hard reset to follow."