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

Commit e84e02ec authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp 

Merge commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d'

* commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d':
  Fix a race between requesting/loading/writing SharedPreferences.
parents f6eb6915 6eba882d
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