tree bd587cbafdfac3490aa1168fdd8e108a07e11751
parent a07762368aae78c48a6f4622ea560ba84057f029
parent 375dd1838f7ad488900dee45c83d77ef95a274dc
author Selim Cinek <cinek@google.com> 1504907695 +0000
committer android-build-merger <android-build-merger@google.com> 1504907695 +0000

Merge "Fixed the icon clipping of the notification shelf" into oc-mr1-dev am: 7e03612659
am: 375dd1838f

Change-Id: I538c1a9bd7be4c04fbb44d45990850b5a18f3f57