tree 1a14d63ad6963d8987195f1e308a06361cd6e361
parent bca162a98b8e3ccb8400d41c05b80bc1fe847451
parent 704320650308bcdf43580b46aeba3af35c4ec92d
author Tao Bao <tbao@google.com> 1455133617 -0800
committer Tao Bao <tbao@google.com> 1455133617 -0800

resolve merge conflicts of 7043206503 to nyc-dev-plus-aosp.

Change-Id: I2c34d9428a1ce15fc625865aa4d5b6e02b796591