tree a727d2f144d74a78c4fd7b1723e537a4786c02cc
parent cb772c36a3befbe1a69fb6d2d8a9f7ae3b8817c2
parent b4cbb4c8ccdc2b90f32a9c9f0e5c928d2dcf5337
author Eric Laurent <elaurent@google.com> 1462559409 -0700
committer Eric Laurent <elaurent@google.com> 1462559531 -0700

resolve merge conflicts of b4cbb4c to nyc-mr1-dev-plus-aosp

Change-Id: I35d8b727cd9bd31ba5cb1286a6e417d5c573f67a