| commit | 3f5175fccd39c341064e8bd86cb03dba4bc6881c | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Wed Feb 04 14:47:23 2015 -0800 |
| committer | John Reck <jreck@google.com> | Wed Feb 04 14:47:23 2015 -0800 |
| tree | 0fb273df4aed6739bbeba197a9f31635bdbbc7a3 | |
| parent | 37a6ad9755cbf49929f089523c99ad187f22b63b [diff] | |
| parent | c7e6b93aba9dce93aacb05b5d9f59d09eddb0329 [diff] |
resolved conflicts for merge of c7e6b93a to master Change-Id: I4b791f37193727a0306214645f2f98cdf218cad0