Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecc7ca53 authored by Michael Wright's avatar Michael Wright
Browse files

resolved conflicts for merge of fa2e53cc to master 

Change-Id: Idc54765c28ab7c6c810095aba1ba21d7695e08d5
parents 659a05a2 fa2e53cc

core/java/android/view/ViewRootImpl.java

+1 −1

File changed.

Contains only whitespace changes.