tree fd9b547dacce63a5007bf04285eca2ac7026f1ae
parent 3de2d8d14a5d45dd6129aef36d66619f236f6710
parent 07b3ebc3d3f8d7cca5945abd2c9878d2d601447e
author Zoltan Szatmary-Ban <szatmz@google.com> 1445174651 +0100
committer Zoltan Szatmary-Ban <szatmz@google.com> 1445174651 +0100

resolve merge conflicts of 07b3ebc3d3 to mnc-dev.

Change-Id: If959b8ee9ffe4d9aad65b43ca553a37c146d1c47