| commit | 3cf59d567072562e120b9524f47ad2bd373f8333 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sun Nov 10 21:04:10 2013 -0800 |
| committer | Brian Carlstrom <bdc@google.com> | Tue Nov 12 01:56:06 2013 -0800 |
| tree | b4235d4a11074310bd6315b005b9d53a4b7511cc | |
| parent | fb0c1951a6eeacd915618e324104e4d49e78d59e [diff] |
Revert "resolved conflicts for merge of ad93c622 to master" This reverts commit 4f6a77d529ae295630e22d4636c2acc2ba2fbb6d, reversing changes made to bcdbbfebc8f32566d4cb3f66405e89cdb7351992.