tree 9ad991d71ffe2229de0ce52162f198225f22c44a
parent ef45a88680ee00fe2283ee68dab884b150dc45ab
parent 48be23c8ed0bcceda1abd80e1df4d1abc20f042f
author Tim Kryger <tkryger@google.com> 1481842471 -0800
committer Tim Kryger <tkryger@google.com> 1481842471 -0800

resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp

Change-Id: Ia6c502d22d7fc42b5fc13b625f14643f3d7ddf44