tree 6717c7458ea1ca709bf743a7a26c3552e57493bc
parent eeaa0ea9cc01d2be91912acbccb07fbffde67558
author Marco Nelissen <marcone@google.com> 1487024380 -0800
committer Feng Yu <feny@google.com> 1487122643 +0000

resolve merge conflicts of 79cf158c51 to mnc-dev

Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643
(cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122)