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

Commit 325c4c9a authored by Dan Albert's avatar Dan Albert
Browse files

resolved conflicts for merge of c1ced8bb to master

Change-Id: I83db00ff986ace8a1c77648738b93124613ddfc0
parents 47513e87 c1ced8bb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public:

BBinder::BBinder()
{
    atomic_init(&mExtras, 0);
  atomic_init(&mExtras, static_cast<uintptr_t>(0));
}

bool BBinder::isBinderAlive() const
+1 −1

File changed.

Contains only whitespace changes.