| commit | d48bb67aacc49ccd2f6aad379e9aea89dcab61c6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Apr 28 13:53:25 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Apr 28 13:53:25 2014 -0700 |
| tree | fbaad402c33c2fca41717930b9c644c94866bf2a | |
| parent | bbf3eb56b627d0fe9cecc57bf3fc8c3dfc3270d5 [diff] | |
| parent | e6ae3be8296b5f92e80653b37420e33e25a0b9a8 [diff] |
resolved conflicts for merge of e6ae3be8 to master Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210