tree 21678ca25ac653006629b737234db5dc16546620
parent b553f3c2f9f2deb58c7e1692a044426131178f52
parent ed0ccb8a008f43cb6d4acdf54e9d2eabb2817758
author Daniel Xie <dxie@google.com> 1443506370 -0700
committer Daniel Xie <dxie@google.com> 1443506370 -0700

resolved conflicts for ed0ccb8a to mnc-dev

Change-Id: I0938cf7bf1cfacc29083692907e8be20811d36cb