tree 1a5ef6484d30f5e9d1236bf678c90e999148094a
parent 78d93fcd28d4fba5e28fa29eee6d373a5e5c180d
parent de591df31fa378fa20dcf9e778072bcdedc0aeb0
author Naveen Kalla <mrnaveen@google.com> 1477693367 -0700
committer Naveen Kalla <mrnaveen@google.com> 1477693464 -0700

resolve merge conflicts of de591df to nyc-mr2-dev-plus-aosp

Test: Resolved merge conflict and make sure change compiles

Change-Id: I341d3be774687f6cc62f9abb5998ebd6389d07ee