tree 9fe8ed728f052a5ee8d715f9f3d5b2b3addf4141
parent 82208b730fa18a39abb19e67b4d744aecc12678c
parent 7bf98aa8a0c122aec9f3262fe1a24238d57ae8d0
author Luis Hector Chavez <lhchavez@google.com> 1528218608 -0700
committer Luis Hector Chavez <lhchavez@google.com> 1528218608 -0700

resolve merge conflicts of 7bf98aa8a0c122aec9f3262fe1a24238d57ae8d0 to pi-dev-plus-aosp

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I08252155f04e8b414f2149d8b29e5e2fff6bcc82