Google Git
Sign in
android / device / asus / fugu / 718916bdf9bae9f5150818685201c685d0f90353
commit718916bdf9bae9f5150818685201c685d0f90353[log] [tgz]
authorNicolas Geoffray <ngeoffray@google.com>Wed Sep 20 09:45:23 2017 +0100
committerNicolas Geoffray <ngeoffray@google.com>Wed Sep 20 09:45:23 2017 +0100
tree5bf831af2a60b626d7eafa10b5f177ce3e245c71
parent64bc4f01e6d9890f56ac7f103bda0666a8713d14 [diff]
parent3c9c11746af0f6d8f3abf30d3f32c9b0f3a342fe [diff]
resolve merge conflicts of 3c9c117 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie87035926bc9ab1590a8c1635cab12e028ad0953
tree: 5bf831af2a60b626d7eafa10b5f177ce3e245c71
  1. bluetooth/
  2. dumpstate/
  3. factory-images/
  4. kernel-headers/
  5. libaudio/
  6. original-kernel-headers/
  7. overlay/
  8. power/
  9. recovery/
  10. self-extractors/
  11. sepolicy/
  12. Android.mk
  13. AndroidBoard.mk
  14. AndroidKernel.mk
  15. AndroidProducts.mk
  16. aosp_fugu.mk
  17. audio_policy_configuration.xml
  18. BoardConfig.mk
  19. bootanimation-580-256col.zip
  20. bt_vendor.conf
  21. codec_resources_limitation.xml
  22. compatibility_matrix.xml
  23. device.mk
  24. egl.cfg
  25. fstab.fugu
  26. full_fugu.mk
  27. gpio-keys.idc
  28. gpio-keys.kcm
  29. gpio-keys.kl
  30. init.fugu.countrycode.sh
  31. init.fugu.diag.rc.userdebug
  32. init.fugu.rc
  33. init.fugu.usb.rc
  34. init.recovery.fugu.rc
  35. manifest.xml
  36. media_codecs.xml
  37. media_codecs_performance.xml
  38. media_profiles.xml
  39. mfx_omxil_core.conf
  40. Nexus_Remote.idc
  41. Nexus_Remote.kl
  42. powervr.ini
  43. proprietary-blobs.txt
  44. recovery.fstab
  45. releasetools.py
  46. sep_policy.conf
  47. Spike.kl
  48. ueventd.fugu.rc
  49. vendor_owner_info.txt
  50. vendorsetup.sh
  51. video_isv_profile.xml
  52. wpa_supplicant.conf
  53. wrs_omxil_components.list