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

Skip to content
Commit 7a10a986 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge branch \'stage-aosp-master\' of... 

Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master am: c74dd7fc
am: 6ae3fe18  -s ours

* commit '6ae3fe18':
  Use std::unique_ptr instead of UniquePtr.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
parents 429c5b93 6ae3fe18
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