| commit | f6e06b32266c77c820e67cbfb92fabe2051786a0 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Dec 02 16:22:57 2014 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Tue Dec 02 16:22:57 2014 -0800 |
| tree | 62e98f20c3714034163e856c358d0b0eaa45a95a | |
| parent | 8dea95b7013c98a1e827001f0caa733bfaa7774d [diff] | |
| parent | eb0754b2da8c7e6159ab01b471a62a9b5aa1089f [diff] |
resolved conflicts for merge of eb0754b2 to master Change-Id: Ifcde272f882e55998b16e02cca1e827dec35ce6f