| commit | 8330dac12f312495a2ae2d525917bf4f898edf9a | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Tue Jul 14 16:10:19 2015 -0700 |
| committer | Santos Cordon <santoscordon@google.com> | Tue Jul 14 16:10:19 2015 -0700 |
| tree | 390f1e43e52fa585808151d4e8137ff9fb200980 | |
| parent | 033688325b49778af4f3ca20cad1309703345be0 [diff] | |
| parent | 389b56b3dbfd2f7903f091846a03e55d5f030eb9 [diff] |
resolved conflicts for merge of 389b56b3 to mnc-dr-dev Change-Id: If85e8e64516bdf9c2640fdabe772c7aaa2397fef