tree 108cead8ed6bf16488fd843159eb61589ec2e6d2
parent ba33da288418387234637c6806e103936530cb53
parent 7ce287d432dd3a4dc8841fc59e11ee1a0b7808a1
author Tianjie Xu <xunchang@google.com> 1464993892 -0700
committer Tianjie Xu <xunchang@google.com> 1464993892 -0700

resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp

Change-Id: I2194d1170281f58eb508f2ef63b39c8729125f76