tree 8ff8ce2dc85c8be43647e1bd7125e33d735ca3c8
parent 1a866dc2178c70f1eddc4047453b980b9f546fd8
parent 9cbe37e723ca8845b8f9707571c6b75a18845431
author Tao Bao <tbao@google.com> 1466541326 -0700
committer Tao Bao <tbao@google.com> 1466541446 -0700

resolve merge conflicts of 9cbe37e to nyc-mr1-dev-plus-aosp

Change-Id: I9643386f714fe520e5732d0e6dbe821131ea6d02