| commit | f36c3ea8ffccd461d4f38d97e4edd44f63989559 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed Dec 18 23:43:36 2013 -0800 |
| committer | Christopher Ferris <cferris@google.com> | Wed Dec 18 23:43:36 2013 -0800 |
| tree | b66edaead95299e4375d3eedc8c4f04833d0497e | |
| parent | f9c4078ab76c694dc5284f6fb0a0cf4e22ed1102 [diff] | |
| parent | 85e0dd89e08e0fe2b1baeb5089aece3ebfbe1266 [diff] |
resolved conflicts for merge of 85e0dd89 to master Change-Id: I21f7ffb9a582681877e2dbad54185ee37d18410e