tree 9008e8c7c81057ff2ac925b58b6526ba0bb334b4
parent 05d50538e01e65538263f5e758316caa487e4a0f
author Chris Craik <ccraik@google.com> 1479321234 -0800
committer android-merger <android-merger@vpba3.mtv.corp.google.com> 1480532154 -0800

resolve merge conflicts of 3802db4 to mnc-dev

bug:32338390
Change-Id: I304c0c8c646808e690918eae7d34f0852e2b0fa8
(cherry picked from commit fffaa9f25edddc6fa10512c1cc19f625c2abee8c)