| commit | 3126041ba8bdfceddb28ed93f9c82f52122739cf | [log] [tgz] |
|---|---|---|
| author | Svet Ganov <svetoslavganov@google.com> | Sun Jun 14 15:59:41 2015 -0700 |
| committer | Svet Ganov <svetoslavganov@google.com> | Sun Jun 14 15:59:41 2015 -0700 |
| tree | b87e32f1e3c1599235e0dea229754509ee27a40f | |
| parent | bed0e7236dec0d6f9fb3dadc944385958ce66fdc [diff] | |
| parent | 0fcc46acade88415c5bae34dfa777aafdb3a4fc8 [diff] |
resolved conflicts for merge of 0fcc46ac to mnc-ub-dev Change-Id: Ib97f5a681494d297355ee384f135963a7e0f0a6f