tree 9d53ec5b38b73e9f9153ca879f7e586030341731
parent c40a360ac68af0739beaf7635f087ca7f99cfe9f
parent 19d8e4e04e6cb63aa00bc23d93f6e936a6341e1c
author Adrian Roos <roosa@google.com> 1501248240 +0200
committer Adrian Roos <roosa@google.com> 1501248240 +0200

resolve merge conflicts of 19d8e4e04e6c to oc-mr1-dev

Change-Id: I20767112223cfa9198be3299548dffc717077ef2