| commit | 5db046bda4f023220133e52cc3782a7e15af5633 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Tue Oct 14 11:06:32 2014 -0700 |
| committer | Evan Charlton <evanc@google.com> | Tue Oct 14 11:06:32 2014 -0700 |
| tree | 8812a38c001a4a53c175a6362d4dceef9e1cfec9 | |
| parent | 36d94c6ba06cf441b88bfa8c33f7b3a9b6dd40a0 [diff] | |
| parent | 9963fc120a7cead0593e8ec00af1bf2d8971bf78 [diff] |
resolved conflicts for merge of 9963fc12 to master Change-Id: I2339dcafc38693bf6c89d4e3643627270791442e