tree ae5a3b428bd11fc7f00d3041905deb56dc5095d2
parent 4bff3b4fb662b657b7092aed15c84bef526c26b4
parent 461aef854d61992dc1dc37d001d19cc5640fa382
author chen xu <fionaxu@google.com> 1541009142 -0700
committer chen xu <fionaxu@google.com> 1541016431 -0700

resolve merge conflicts of 461aef854d61992dc1dc37d001d19cc5640fa382 to pi-dev-plus-aosp

Bug: 118351153
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib804121f94f2fec404b39b90700092783b6ba58c
Merged-in: I4a71c61929d9df8ec13c157e0452c6f30d8e4b9c