tree 66ece69b7161dc95e97872d4fa476143f77c79a4
parent 6f3e42399459f053cddda4fa2190f0ece3387e06
parent 3b8e6b2f30af0564538c2a660033d6a97ab8038f
author Matthew Bouyack <mbouyack@google.com> 1475793416 -0700
committer Matthew Bouyack <mbouyack@google.com> 1475793478 -0700

resolve merge conflicts of 3b8e6b2 to nyc-mr1-dev-plus-aosp

Change-Id: I9c02a56d63de5828453aa8926ca801d96b04a6cf