tree 530ed0e32eeef4cf9b7e0bee897a318f43aeb42b
parent aabbbfde4831c2a9c9c50a3bf38b2a3ff346b8f4
parent 7354c0e18bac5247494b9c5d76d5d8dcb9100d20
author Mohamad Ayyash <mkayyash@google.com> 1466008684 -0700
committer Mohamad Ayyash <mkayyash@google.com> 1466008684 -0700

resolve merge conflicts of 7354c0e to nyc-mr1-dev

Change-Id: I19693f5459794b71decfae4507fb2742c74f7c41