tree 02c32efeb600144551df8b8eb035d1c833f8d29c
parent 0f54a46af3d2fa5f01fd1e37ed050b3cf697008c
parent 61799baba3631f55469d2754542130255ce790cf
author Yabin Cui <yabinc@google.com> 1459295238 -0700
committer Yabin Cui <yabinc@google.com> 1459295238 -0700

resolve merge conflicts of 61799ba to nyc-dev-plus-aosp

Change-Id: Ib1d0afe9022ec82f05be8b56201e73505160cacc