tree e8e7215cdad0cc053fb5c4c4954f3779cf9638f1
parent 005a84cd526ce2617507763e98400df7c1744a0b
parent 3481659b1f5ea7c8de362986cc7abfd3322ee9ca
author Dirk Dougherty <ddougherty@google.com> 1462248193 -0700
committer Dirk Dougherty <ddougherty@google.com> 1462248193 -0700

resolve merge conflicts of 3481659 to nyc-dev

Change-Id: Iea83aebfd5e8a7fa0dcb0c459588048d0f7ce47e