tree cd2c027b738001ac8faa73b105cb40a98d5f7d73
parent c0213856b7cfc40611213d6177f5f56998fa3aa8
parent bcdd582db5b994da0999383a72184aa51a7bbce3
author Selim Cinek <cinek@google.com> 1521614677 +0000
committer android-build-merger <android-build-merger@google.com> 1521614677 +0000

Merge "Merge changes from topic "heads_up_redesign" into pi-dev am: db0e4f1d73" into pi-dev-plus-aosp
am: bcdd582db5

Change-Id: Ia7fbe8a8b6579a00e0fcdbb62c4d7d53c793d183