git.osdn.net Git - android-x86/frameworks-base.git/commit

(root) / android-x86 / frameworks-base.git / commit

author	Dan Sandler <dsandler@android.com>
	Wed, 17 Oct 2018 22:56:22 +0000 (18:56 -0400)
committer	Daniel Sandler <dsandler@android.com>
	Thu, 18 Oct 2018 13:44:22 +0000 (13:44 +0000)
commit	134e4b284be95cd8ad3dbb340bc1cae6b703dbd2
tree	f02336fe03ee67668ae38a62bdd4b548fd07b18f	tree \| snapshot
parent	bae081d20264d8df21854f27e618a1cb2a5e50fa	commit \| diff
parent	aad998c0b4b97190754e72548960cf72b967dc0f	commit \| diff

resolve merge conflicts of aad998c0b4b97190754e72548960cf72b967dc0f to pi-dev-plus-aosp

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icf172daeb848f746c81acd25a4406decc00ed875
Merged-In: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067

core/res/res/values/config.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	diff1 \|	diff2 \|	blob \| history

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help

core/res/res/values/config.xml	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	diff1 \|	diff2 \|	blob \| history