tree 17a047671045ce1287928328d78085b32f262e99
parent 431c355cb5a29366772e580921af1eb916aea602
parent 1f1a6fdac88650c135b1f113330e5c47d85c25e5
author Nick Vaccaro <nvaccaro@google.com> 1480373506 -0800
committer Nick Vaccaro <nvaccaro@google.com> 1480373910 -0800

resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp

Change-Id: Ic07b6db6f47d2157aef0d04d025ba747d0a4247d