tree e4884c5c70dcde2cb1a346f8f7259839826c6f85
parent 8a55c653458c2d33af506b193e658faf8f88bfa3
parent 50f6417317f9e327ed76abaf34512370f8376245
author Tianjie Xu <xunchang@google.com> 1464028960 -0700
committer Tianjie Xu <xunchang@google.com> 1464031468 -0700

resolve merge conflicts of 50f6417 to nyc-dev-plus-aosp

Change-Id: I42c127f7946e678acf6596f6352f090abc0ca019