Gitiles
Code Review Sign In
review.blissroms.org / platform_system_core / 392dbeeb0771997e1991a2c540796bbdbe2c65c7
commit392dbeeb0771997e1991a2c540796bbdbe2c65c7[log] [tgz]
authorAkilesh Kailash <akailash@google.com>Wed Feb 03 18:39:01 2021 +0000
committerAkilesh Kailash <akailash@google.com>Wed Feb 03 18:39:01 2021 +0000
treea93966b97f5aa0e0eafc959d1d23f5b610c2430f
parent9e082d49525567765fce8c0be697bf61da8f9f27 [diff]
Remove invalid error message in the merge path.

Bug: 167409187
Test: Compile snapuserd
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I7a494627b001cb5be20ac6b1bbded64574c3cec0
1 file changed
tree: a93966b97f5aa0e0eafc959d1d23f5b610c2430f
  1. bootstat/
  2. cli-test/
  3. code_coverage/
  4. cpio/
  5. debuggerd/
  6. diagnose_usb/
  7. fastboot/
  8. fs_mgr/
  9. gatekeeperd/
  10. healthd/
  11. include/
  12. init/
  13. janitors/
  14. libappfuse/
  15. libasyncio/
  16. libbinderwrapper/
  17. libcrypto_utils/
  18. libcutils/
  19. libdiskconfig/
  20. libgrallocusage/
  21. libkeyutils/
  22. libmodprobe/
  23. libnetutils/
  24. libpackagelistparser/
  25. libprocessgroup/
  26. libqtaguid/
  27. libsparse/
  28. libstats/
  29. libsuspend/
  30. libsync/
  31. libsystem/
  32. libsysutils/
  33. libusbhost/
  34. libutils/
  35. libvndksupport/
  36. llkd/
  37. property_service/
  38. qemu_pipe/
  39. reboot/
  40. rootdir/
  41. run-as/
  42. sdcard/
  43. set-verity-state/
  44. shell_and_utilities/
  45. storaged/
  46. toolbox/
  47. trusty/
  48. usbd/
  49. watchdogd/
  50. .clang-format ⇨ .clang-format-4
  51. .clang-format-2 ⇨ ../../build/soong/scripts/system-clang-format-2
  52. .clang-format-4 ⇨ ../../build/soong/scripts/system-clang-format
  53. .gitignore
  54. CleanSpec.mk
  55. METADATA
  56. MODULE_LICENSE_APACHE2
  57. NOTICE
  58. OWNERS
  59. PREUPLOAD.cfg
  60. TEST_MAPPING