| commit | 96d6c40c7159a6e93c21a3b540e24a6ff916cb4b | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed Mar 18 12:39:23 2015 -0700 |
| committer | Tyler Gunn <tgunn@google.com> | Wed Mar 18 12:39:23 2015 -0700 |
| tree | c102abab08e7c33fd8a8a9e46d058da2b853cdc5 | |
| parent | ac1496a1c9d238d068d30b95f1b78aa66775e1db [diff] | |
| parent | 00de38a188211526e5fc1929b00410991dfb87fa [diff] |
resolved conflicts for merge of 00de38a1 to master Change-Id: Ib1ac99ba7181ad79af94a04124380833bcb79a0c