tree 7dce421d2bb7c3e17b771ed700b5db061aec5aaa
parent ace696d5ac9b20b76401321f004b7912aaa490cb
parent 49daa6e6db00326b9120ee863ad784814d67a1a2
author Daniel Xie <dxie@google.com> 1445566524 -0700
committer Daniel Xie <dxie@google.com> 1445566524 -0700

resolve merge conflicts of 49daa6e6db to mnc-dev.

Change-Id: I42bc78454dfc912ccea7f39aeef41d4241b79095