| commit | 6f16857720d78975877db6dbd09f59a080b167a1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jul 31 15:49:04 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Jul 31 15:49:04 2013 -0700 |
| tree | f8b283775c90d3e947c7ed0e2484544416a66796 | |
| parent | 172f5f57460001b78e100cefa584d8e91738e48a [diff] | |
| parent | 8714c8316492156ae0e23d0bd27f8824da443c86 [diff] |
resolved conflicts for merge of 8714c831 to master Change-Id: I58a6ab217aeaa5de099a9d79d1830c833f718a9d