tree 9416dd7928a6229e739c5069a205c35544f9e926
parent 8eadaf82488fe3c7a106bb17e335447bef5c9bec
author Xin Li <delphij@google.com> 1488846782 +0000
committer JP Sugarbroad <jpsugar@google.com> 1490051349 +0000

DO NOT MERGE
resolve merge conflicts of 1d43fb67 to mnc-dev
am: 1d462cdbb0

Change-Id: I1e527667db9aa5740d135f966e27f52394710eed
(cherry picked from commit e3bbe40b5c344e2964787c687f1bce27c5b2cc63)