commit | bed0e7236dec0d6f9fb3dadc944385958ce66fdc | [log] [tgz] |
---|---|---|
author | Svet Ganov <svetoslavganov@google.com> | Sun Jun 14 15:53:01 2015 -0700 |
committer | Svetoslav Ganov <svetoslavganov@google.com> | Sun Jun 14 22:54:52 2015 +0000 |
tree | b87e32f1e3c1599235e0dea229754509ee27a40f | |
parent | 1e5da9e2f85daf50a981de63801aa3bfc378c736 [diff] |
resolved conflicts for merge of 0fcc46ac to mnc-ub-dev Change-Id: I3adfcde78cd78398719f6ab2713a8d661029779a (cherry picked from commit 5ac334d5fb72e3c248054802db9ca47cbeda4d24)