tree 7450e7b9628dc45c39337fe636f719e105d5dd27
parent 8dc190990154e8fff483084e4b44a1fdce507f0f
parent 57ad046d9d23d16f6b5a27a16d18104ec4770511
author Tianjie Xu <xunchang@google.com> 1464994888 -0700
committer Tianjie Xu <xunchang@google.com> 1464994888 -0700

resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp

Change-Id: I98502950a0882050f5ed1acb0549b218b2cd06e4