tree 1f66cb71e2ccb05fea0b647089d66b728689e177
parent 701627961161087f9edd42b51ae9d2b8ad06b54c
parent ca332ab47ca07ba16861f882d58018c7cb55d94f
author Sami Tolvanen <samitolvanen@google.com> 1465278555 -0700
committer Sami Tolvanen <samitolvanen@google.com> 1465278983 -0700

resolve merge conflicts of eacbb82 to nyc-dev-plus-aosp

Change-Id: Ia3077f826c1d422932b62684ae0d53935abfe807