tree fc7c54a8c23f5849d29d11ffa09c3e641997dc02
parent 23af9abbc8597dda65369b9e05dc100a4231b9cb
parent ed4c49c199224dfe2cf99a26864c5848487da2c3
author Yabin Cui <yabinc@google.com> 1466532044 -0700
committer Yabin Cui <yabinc@google.com> 1466532578 -0700

resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp

Change-Id: I8788cc80473dc77bfa0cd2682f3acb6e17ac36df