| commit | 49bc4acfadf9c5b1e520217278ccb38010d38c89 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Jan 29 12:53:38 2015 -0800 |
| committer | John Reck <jreck@google.com> | Thu Jan 29 12:53:38 2015 -0800 |
| tree | 2731146935070300785f256599ed69a83a9afdab | |
| parent | 293b7b4fe510bf7df879e89bf748c0b8695f4310 [diff] | |
| parent | fe5ac4fc31ee671721f98cf28cf1bd32ac119998 [diff] |
resolved conflicts for merge of fe5ac4fc to master Change-Id: I6c0cc82db14b56297586469f940e408c0e218b3b