| commit | cdd7d8bc145bbbd21a1689ed87a381287aeec229 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Fri Jul 12 14:19:10 2013 -0700 |
| committer | Mathias Agopian <mathias@google.com> | Fri Jul 12 14:19:10 2013 -0700 |
| tree | 3c1baae72f829e2fa0e0412bcee629deeabc7728 | |
| parent | 1bd5068a5180ac12dda374e15c7b1f70e8334284 [diff] | |
| parent | 00aea5c5ff9e951024c5751fcce2e8f5602a6460 [diff] |
resolved conflicts for merge of 00aea5c5 to master Change-Id: Ie1769be863ee2d411eae451907a928db57882e14