Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Chris
android_vendor_pac
Commits
a9cab225
"...git@git.sphere.ly:varun.chitre15/thunderzap_sprout.git" did not exist on "58b053e4ce9d2fc3023645c1b96e537c72aa8d9a"
Commit
a9cab225
authored
12 years ago
by
KBizzle
Browse files
Options
Download
Email Patches
Plain Diff
Correct issue with merge
parent
c97da8c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletion
+0
-1
products/AndroidProducts.mk
products/AndroidProducts.mk
+0
-1
No files found.
products/AndroidProducts.mk
View file @
a9cab225
...
...
@@ -46,7 +46,6 @@ endif
ifeq
(pac_i927,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES
+=
$(LOCAL_DIR)
/pac_i927.mk
endif
<<<<<<<
HEAD
ifeq
(pac_d710,$(TARGET_PRODUCT))
PRODUCT_MAKEFILES
+=
$(LOCAL_DIR)
/pac_d710.mk
endif
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment