| commit | 3b33fff736131a1067bf47228a3b8853703c02b3 | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Tue Oct 20 16:23:25 2015 -0700 |
| committer | Santos Cordon <santoscordon@google.com> | Tue Oct 20 16:23:25 2015 -0700 |
| tree | 8861e4fce8c93a905df3752e31f1186b5341c084 | |
| parent | 49eedf25edde40d71307d28b4f379b482dea1df8 [diff] | |
| parent | fff1c1dc2ffc2372b02b5bb78a8dfd0a16659ea8 [diff] |
resolve merge conflicts of fff1c1dc2f to mnc-vt-dev. Change-Id: I62fd7bd6f774c8a6ba4fa00bca7c50c2db7b42a0