tree bf7cafa93c11083a01d65e3c8b931c53ffb64c74
parent 41c30ae906f2a0e1344c42466653b269e0aa9656
parent 4c7fd94ae9b9231281916c072f9120612e14093b
author Daniel Xie <dxie@google.com> 1442965757 -0700
committer Daniel Xie <dxie@google.com> 1442965757 -0700

resolved conflicts for 4c7fd94a to mnc-dev

Change-Id: If60477b7839513eae9ef0b6eae0189d0407413c0