tree ddbc8db5c641f7892db8c2e4c8e26a9afbfcf8a9
parent 7b2d3c5e1d4b77085494c3696d4282858136d81e
parent 72b26859227fde9de20825d6776ef9b26c42c194
author Neil Fuller <nfuller@google.com> 1432635202 +0100
committer Neil Fuller <nfuller@google.com> 1432635667 +0100

resolved conflicts for merge of 72b26859 to lmp-mr1-ub-dev

Change-Id: Id188dacbfd8e83fd884f838e392444890a231e5e