tree d3f5efe85d83ad189204fae292d6e898f7b0d93d
parent 66e9e7c701d66f0102c48ca60db12c558bb611d2
parent 5013f1c08cb08eb50e809586050e6ac7319785f6
author Selim Cinek <cinek@google.com> 1539645500 -0700
committer android-build-merger <android-build-merger@google.com> 1539645500 -0700

Merge "Fix overlap between operator name and heads-up notification" am: a3608c9116
am: 5013f1c08c

Change-Id: I786b5445e080a3fa9ae9ed90d023c5a6c5a812d5