| commit | 9de8c1d82b6bf2b70e854a3349c9f1da60a23e83 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Apr 03 11:51:37 2014 -0700 |
| committer | Jeff Tinker <jtinker@google.com> | Thu Apr 03 11:51:37 2014 -0700 |
| tree | 0bfae2ba1d400a49c040ce869527055a25ca2025 | |
| parent | ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a [diff] |
resolved conflicts for merge of 4f342e87 to master Change-Id: I2cdb238759beb49fede2de703df8defee92d316f