| commit | 87cebadd48710e42474756fc3513df678de045ce | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 22 10:14:43 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu May 22 10:14:43 2014 -0700 |
| tree | 6f8a07d9ec9b4ebad70367430190a689cb1a5db3 | |
| parent | 77a3374a6170fb5f0168169bc4bc3fa9baf318eb [diff] | |
| parent | f285c91efbae23783fe94dc5ad19a2560e157685 [diff] |
resolved conflicts for merge of f285c91e to master Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65