| commit | fdbaca3184832ea83477e48d4c64f5e21301d14a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 11 10:30:47 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Jul 11 10:30:47 2014 -0700 |
| tree | 3b7f439f372b2cb3786b489b98d2d9f062dc40ce | |
| parent | 3d8cbb806f54d9467bd67b7fcae21a928c56064d [diff] | |
| parent | afe75547f38da2ac861899ccc324313b16a4c077 [diff] |
resolved conflicts for merge of afe75547 to master Change-Id: I38656e06ce76daf60b31029f2ef83d6911a76f0f