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

Skip to content
Commit 30af6141 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-4.2.2_r1' of... 

Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/native into 1.1

Android 4.2.2 release 1

Conflicts:
	libs/ui/GraphicBufferAllocator.cpp

Change-Id: Id60a6580bf5a3ba04f8e1e2b1b950e0b93888166
parents be1b7537 529cb9ed
Hide 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