tree 95a6c3d1b7c9aac054aa26b5953795867c059131
parent 4cc80210d973e2ba01d726dbd537a43f87003de6
parent 235f8acd3cf83079ecd0f3e1b8368b0c9886de82
author Vitalii Tomkiv <vitalit@google.com> 1459966295 -0700
committer Vitalii Tomkiv <vitalit@google.com> 1459966295 -0700

resolve merge conflicts of 235f8ac to nyc-car-dev

Change-Id: I49327e591ef08875a92928535a1a0c69f7368804