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

Commit 18cddd75 authored by Ned Burns's avatar Ned Burns Committed by Automerger Merge Worker
Browse files

Merge changes I8ca03eb4,Iccd924ca into sc-dev am: f2446930 am: c3d7c82b... 

Merge changes I8ca03eb4,Iccd924ca into sc-dev am: f2446930 am: c3d7c82b am: bd8c027f am: 15acb40d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15475533

Change-Id: I0bfcba2ea2855b7465ec00f0a72e7083864ba30c
parents 11f0a3fe 15acb40d
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