| commit | 40e6ac91665b57cf6e794e731d1b1c7142175abe | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Wed May 13 11:31:26 2015 -0700 |
| committer | Dirk Dougherty <ddougherty@google.com> | Wed May 13 11:33:26 2015 -0700 |
| tree | 0bad117a5b2d51e0ce795a58c782c87b28908a3f | |
| parent | 876677ef2d04545593fd4cd7bb8539fa15e3dc09 [diff] | |
| parent | 45fed51720c152c4d41dc86364e5a3c391b251af [diff] |
resolved conflicts for merge of 45fed517 to mnc-dev Change-Id: I08e44ee778436e5592e73ced82356f015cbdfe74