tree 0bfae2ba1d400a49c040ce869527055a25ca2025
parent ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a
author Jeff Tinker <jtinker@google.com> 1396551097 -0700
committer Jeff Tinker <jtinker@google.com> 1396551097 -0700

resolved conflicts for merge of 4f342e87 to master

Change-Id: I2cdb238759beb49fede2de703df8defee92d316f