tree 1355e96d51267c03f9157da55fdd9ecf138a8a48
parent 84341566343c68cbffe5aa27115b242c7a3059f1
parent 3f7c34859e484be7ec710837fbdb9563c3f8d328
author Alex Light <allight@google.com> 1467240225 -0700
committer Alex Light <allight@google.com> 1467240234 -0700

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

Bug: 29278988

Change-Id: Icffb9a280311c7d3c45f096243ddf18f7ebecd9d