tree fb52778f9aa8b00ad5f1ec27d89c187f2707d51e
parent 24952cf098ff5fe8934d1d7ee786680103e9cc0e
parent 565ba02b89b64deb8bf7232ac2c2a38b01f63523
author Damien Bargiacchi <drb@google.com> 1473781057 -0700
committer Damien Bargiacchi <drb@google.com> 1473781057 -0700

resolve merge conflicts of 565ba02 to nyc-mr1-dev-plus-aosp

Change-Id: Ic2152775c96dc28f808fc7b97433f8c3d2135948