tree ffa3ba5f9d8f326beca981d2d3abe163bb8451f1
parent 9b320b15a25e6a37fee258d79011fb5d7db6f023
parent e45b35d186595cccb035a00d6e4c2f4bee23a507
author Malcolm Chen <refuhoo@google.com> 1523394833 -0700
committer Malcolm Chen <refuhoo@google.com> 1523394833 -0700

resolve merge conflicts of e45b35d186595cccb035a00d6e4c2f4bee23a507 to pi-dev-plus-aosp

Change-Id: Ice8f3c6c64a137391d116f69ba4c32347ffea17b