| commit | bbec33053cc35ad5af0fa48d9e8f77644433be6f | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Wed May 14 11:08:04 2014 -0700 |
| committer | Evan Charlton <evanc@google.com> | Wed May 14 11:16:26 2014 -0700 |
| tree | 841f4494ee4d2e32a6a064caa29e5bd0636524c3 | |
| parent | 486407a63a0570a4fa2e93603100db30664441db [diff] | |
| parent | 4d611662e17878203be2770142409829c1a2d4e4 [diff] |
resolved conflicts for merge of 500e399c to master Change-Id: I7cc16e713bb142450c7689942097110bde404b54