tree 7ba30dd51b65f29b80a0f4b1d26d1655987fa35e
parent d4de6c34b7527d8ce7dec0ccf5a0b22b0772285f
parent 199f36c95a7d43e66c14176c2fb2e3f4e33af29a
author Marco Nelissen <marcone@google.com> 1487028098 +0000
committer android-build-merger <android-build-merger@google.com> 1487028098 +0000

resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0
am: 199f36c95a

Change-Id: I6e7307dcff161e32794ba15368bd00a5f625fd09