tree c3ba43533ff2c2a40f2cad9ae8da9d6ff45e627f
parent 31da1779e70b9a39c16d2bcc2c3cbb34785cb13b
parent 20ebbb3349cdf72d7d28c870849e532f227c74b4
author Pavel Zhamaitsiak <pavelz@google.com> 1459816925 -0700
committer Pavel Zhamaitsiak <pavelz@google.com> 1459816925 -0700

resolve merge conflicts of 20ebbb3 to nyc-dev

Change-Id: I31d76a02456b3f09a6bdac11c6dbc5e913f5f7df