tree 02187624009d3463b6a9e3529673ddcd2b2b6fde
parent fffaa9f25edddc6fa10512c1cc19f625c2abee8c
parent 89cdd4cbcc47d60a70c0625d8a65490fd3becb12
author Chris Craik <ccraik@google.com> 1484254580 -0800
committer Chris Craik <ccraik@google.com> 1484254580 -0800

resolve merge conflicts of 89cdd4cb to mnc-dev

Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207