tree 11af9ea5d7937544132de1e57a46a66813707c9e
parent 31670090bfa252284bd0d6229e7a3d111d651ee5
parent 50358a80b1724f6cf1bcdf003e1abf9cc141b122
author Marco Nelissen <marcone@google.com> 1487027467 +0000
committer android-build-merger <android-build-merger@google.com> 1487027467 +0000

resolve merge conflicts of 79cf158c51 to mnc-dev
am: 50358a80b1

Change-Id: I9f0220c41cf629652329ed624469f6442186eca3