tree 997e7486b67e0cca770930c4501eeda27c58ef73
parent efe8307df19eef5285cca0f5213f4dfbc1a661b6
parent f4232c3c69a7ef3cb4d6ee8c3b87593f482d3f95
author Diego Perez <diegoperez@google.com> 1437488890 +0100
committer Diego Perez <diegoperez@google.com> 1437489175 +0100

resolved conflicts for merge of 112d8a36 to mnc-dev

Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2