OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dce00f9 a8af2d3)
resolve merge conflicts of a8af2d3664eab2eae6f670ef0fb79969010c34c3 to pi-dev-plus...
authorStanley Tng <stng@google.com>
Tue, 16 Oct 2018 04:56:50 +0000 (21:56 -0700)
committerStanley Tng <stng@google.com>
Tue, 16 Oct 2018 15:31:00 +0000 (15:31 +0000)
commit0cc7d9a2af4b8186c5fae6f56920d9e124e53ecb
tree0f0416d588d27ab6807a31100f6eb6575edb665ctree | snapshot
parentdce00f9ae240673f3700d52e96007ca42bd305d4commit | diff
parenta8af2d3664eab2eae6f670ef0fb79969010c34c3commit | diff
resolve merge conflicts of a8af2d3664eab2eae6f670ef0fb79969010c34c3 to pi-dev-plus-aosp

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
src/com/android/settings/development/featureflags/FeatureFlagPreference.java diff1 | diff2 | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help