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

Commit 774ece35 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 41e0b205: am 2657d889: (-s ours) am b259c04d: Merge "Merge commit... 

am 41e0b205: am 2657d889: (-s ours) am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1

* commit '41e0b205c4ac28b2ca583d9de5ea1676786ba882':
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
parents 7dce9e3e b69e488d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment