| commit | 456eb61cc3fd3a250636fbcea6b73a973c77ad5c | [log] [tgz] |
|---|---|---|
| author | Jose Lima <joselima@google.com> | Thu Aug 20 19:45:37 2015 -0700 |
| committer | Jose Lima <joselima@google.com> | Thu Aug 20 19:45:37 2015 -0700 |
| tree | 0448fa02ac2e5c141946f4580171f2bcb1f69113 | |
| parent | 0c2c2c650e4f80c7cc15bc4b47a318def6f73840 [diff] | |
| parent | 262c08577a6a7a46f1a18cc849e850728b7d796a [diff] |
resolved conflicts for merge of 262c0857 to mnc-ub-dev Change-Id: I9973c3127d02eed3858565d9e5111a0b84f76e45