| commit | 91beb94c65716f78a120cff93e3bb78a190500b4 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Jan 22 19:02:04 2014 -0800 |
| committer | Christopher Tate <ctate@google.com> | Wed Jan 22 19:02:04 2014 -0800 |
| tree | 16498bd6e6f3f190ead98ea5d411fca471eca9e2 | |
| parent | 052665d9720800c9f9dfc488592f1f0bce0e3a71 [diff] | |
| parent | a5bb65aaf0695c7d84045fb4e044b63170dd5790 [diff] |
resolved conflicts for merge of a5bb65aa to master Change-Id: Ib286d5194f68c55cfd2e5c17a5eb89ea32add574