tree f3e493daa18566597f49fb00132aa4624608cca6
parent fb594d8e4f24f9c845d49ed72ed15e92df46130b
parent b8c66380ba649264bfff1a15d285bb7a7e4d1e08
author David 'Digit' Turner <digit@google.com> 1401265146 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1401265147 +0000

Merge "resolve merge conflicts of 838c441 to master."