| commit | 3080c001b53e125ffc6b6785677bbc30e748783a | [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 | 70cafe1b526367be8a34d0e0f061cd7fa0cf53aa [diff] | |
| parent | 82f8bca44cce91af358ab6d102edcc7b1b02fbc5 [diff] |
resolved conflicts for merge of 82f8bca4 to master Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210