tree 24800082bfe3f9d018f1db6e556da1fe3c377938
parent e833769e7be7ffa3db8a35c84fc9c6b6aea9f663
parent 5cf4701d6642153a8a571639058b64202edb3ad3
author Elliott Hughes <enh@google.com> 1459275347 -0700
committer Elliott Hughes <enh@google.com> 1459275347 -0700

resolve merge conflicts of 5cf4701 to nyc-dev-plus-aosp

Change-Id: Ia69f8b070c05cfe201115de510e3c12e813e38b5