| commit | 2a05ae733b9dd6c26e858fbf93adf0a2d28e1050 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Tue Jan 27 09:48:47 2015 -0800 |
| committer | Alan Viverette <alanv@google.com> | Tue Jan 27 09:48:47 2015 -0800 |
| tree | c87a1cfc389f34206b9c6dd083dd7903177cded0 | |
| parent | 3cdb3b7d0da84be9d5dba73dc76245bd9f314854 [diff] | |
| parent | da9653a2630b8b7d5f1ee11fdfb037aba3fe3ba8 [diff] |
resolve merge conflicts of da9653a to master. Change-Id: I51a1056b36015986d7e55aa38d658b547c2446e1