tree 4fb137ea5fca1ccdb389fa91a521d2396415a520
parent 99bbe2fffe98c57295a26d35b30e15c432d6a1e3
parent 1f433cb0ffd0b0b44de38180ecf6d4b7f38a8273
author Sharvil Nanavati <sharvil@google.com> 1466549802 -0700
committer Sharvil Nanavati <sharvil@google.com> 1466549802 -0700

resolve merge conflicts of 1f433cb to mnc-dr-dev

Change-Id: I7278875d21c59316217cb1b99d902f4fc248ca06