tree 491b260014a699b690ce32b1a9554b14eb3705ed
parent ce7c6ff48ea95304d0013e3856fd939082d526ac
parent 23c7af797a2596f57490b76bd33232a80d1a9a74
author Tianjie Xu <xunchang@google.com> 1462213077 -0700
committer Tianjie Xu <xunchang@google.com> 1462213077 -0700

resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp

Change-Id: I04a73db90ddb059dbb5b44fafd8e82d03ea90ca5