| commit | 6d0b2c53c6829ba1f9961b1441cd3fb0281b61af | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Wed Dec 10 14:17:11 2014 -0800 |
| committer | Joe Fernandez <joefernandez@google.com> | Wed Dec 10 14:17:11 2014 -0800 |
| tree | 7fcfb3d724b4b92e5e0c22cf29017ddc4169f326 | |
| parent | 4c7ec3d469c084728412473dadae30851ed89a6c [diff] | |
| parent | f9d2cd9931f12f7cb3459a322e7d92079fcb184d [diff] |
resolved conflicts for merge of f9d2cd99 to master Change-Id: I8690866c6178ae0a18d45c138ffac8e6eb4be630