| commit | 65f2defdfc35bfa485ca00dcf18ea817329a84be | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Fri Nov 07 11:29:08 2014 -0800 |
| committer | John Reck <jreck@google.com> | Fri Nov 07 11:29:08 2014 -0800 |
| tree | a6fbfd457b369d1b3e13f2b473e75093808ee53d | |
| parent | 03b16ae419a781076bcfaf735bb9917a60b95895 [diff] | |
| parent | cabf8a706474210f6afa13e7b288bb537351ad3d [diff] |
resolve merge conflicts of cabf8a7 to master. Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf