tree 4946dd61d81abd9459d1dc94bb9499bc8d3b2ea4
parent 6b953b0f0b2d8e754c7de00fbe02100cae756391
parent 7a2518ee6e46aa7aad6d8de3309e99f0dc1bdcba
author Marie Janssen <jamuraa@google.com> 1481751868 -0800
committer Marie Janssen <jamuraa@google.com> 1481751868 -0800

resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp

Change-Id: I903680717ed121a93fee3b7c2ed358cb29726d71