tree fa21dd41eff4cf57819ebda6f97c3cdf22d26239
parent d40cb164d517d778828aa26219339461b4b3fb41
parent c6a1cfda93aac7fc004da73e3e5921b838e931a7
author Fabian Kozynski <kozynski@google.com> 1539786525 -0400
committer Fabian Kozynski <kozynski@google.com> 1539786600 -0400

DO NOT MERGE resolve merge conflicts of c6a1cfda93aac7fc004da73e3e5921b838e931a7 to pi-dev-plus-aosp

Change-Id: I1a18690e85f66ff2a25329f9a050cb038fc0bcfb
Bug: None
Test: I solemnly swear I tested this conflict resolution.