| commit | 41a0ef3e28c4d2494f6cdd1c831dd3ded7c5af4a | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Nov 14 11:09:30 2014 -0800 |
| committer | Dan Albert <danalbert@google.com> | Fri Nov 14 11:13:20 2014 -0800 |
| tree | 1f4a796523bf66e369c79190cd6cf9a302a8a2c3 | |
| parent | d26b17a1370851b3a6b989cc802a5989bcdb0f45 [diff] | |
| parent | 4037c458a7594cb3cd81a14e7e974abc28180187 [diff] |
resolved conflicts for merge of 4037c458 to master Change-Id: I8a2e73b7ba48b790054e0ab99f81b2693244389e