Gitiles
Code Review Sign In
review.gerrithub.io / CarbonROM / android_device_lge_mako / ca9b0b9cf723f23fa2960fae593392b3fc191184
commitca9b0b9cf723f23fa2960fae593392b3fc191184[log] [tgz]
authorYun Liu <liuyun.97@gmail.com>Sun Apr 19 11:19:54 2015 +0800
committerYun Liu <liuyun.97@gmail.com>Sun Apr 19 03:44:27 2015 +0000
tree1332b47f4233c59ad8c8aeb15bf547bc789b2356
parent703ade6f9fc4bb4e629223d0dc4368fee3c644d2 [diff]
mako: Fix mismerge

Duplicate "disable diag port".
See android.googlesource.com/device/lge/mako/+/3ac5654c0a144eda4925c70e5c2f275e95c31e7c/init.mako.rc

Change-Id: I42932760217219b254c7bb912178d0672b04d2c2
1 file changed
tree: 1332b47f4233c59ad8c8aeb15bf547bc789b2356
  1. bdAddrLoader/
  2. bluetooth/
  3. camera/
  4. charger_touch/
  5. cmhw/
  6. conn_init/
  7. dumpstate/
  8. factory-images/
  9. liblight/
  10. nfc/
  11. overlay/
  12. power/
  13. self-extractors/
  14. sepolicy/
  15. Android.mk
  16. AndroidProducts.mk
  17. aosp_mako.mk
  18. apns-full-conf.xml
  19. apq8064-tabla-snd-card_Button_Jack.kcm
  20. apq8064-tabla-snd-card_Button_Jack.kl
  21. audio_effects.conf
  22. audio_policy.conf
  23. board-info.txt
  24. BoardConfig.mk
  25. CleanSpec.mk
  26. cm.dependencies
  27. cm.mk
  28. device.mk
  29. egl.cfg
  30. extract-files.sh
  31. fstab.mako
  32. full_mako.mk
  33. gps.conf
  34. hostapd_default.conf
  35. hs_detect.kcm
  36. hs_detect.kl
  37. init.mako.bt.sh
  38. init.mako.rc
  39. init.mako.usb.rc
  40. init.mako.wifi.sh
  41. keypad_8064.kcm
  42. keypad_8064.kl
  43. media_codecs.xml
  44. media_profiles.xml
  45. mixer_paths.xml
  46. p2p_supplicant_overlay.conf
  47. pmic8xxx_pwrkey.kcm
  48. pmic8xxx_pwrkey.kl
  49. proprietary-blobs.txt
  50. releasetools.py
  51. setup-makefiles.sh
  52. thermald-mako.conf
  53. touch_dev.idc
  54. ueventd.mako.rc
  55. vendor_owner_info.txt
  56. vendorsetup.sh
  57. WCNSS_cfg.dat
  58. WCNSS_qcom_cfg.ini
  59. WCNSS_qcom_wlan_nv.bin
  60. wpa_supplicant_overlay.conf