| commit | c6e72066eae3776db18399dac605f673712f104c | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Fri Oct 18 13:52:26 2013 -0700 |
| committer | Adam Lesinski <adamlesinski@google.com> | Fri Oct 18 13:52:26 2013 -0700 |
| tree | c1acd8c57bda4c656cb5efeb86e103cccd4ac18b | |
| parent | d431ffbe3013de7038b4714d6fdd4d681d2f1786 [diff] | |
| parent | 91b47365f68e29467912ddfa39dea30e661aff68 [diff] |
resolved conflicts for merge of 91b47365 to master Change-Id: Ia867c4199556bc1210a31bdeb323d7d12e27eb88