Google Git
Sign in
android / device / generic / goldfish / 4acf01e8
commit4acf01e8eb89cd10cedbc9b3a816bf49ece50a20[log] [tgz]
authorRoman Kiryanov <rkir@google.com>Wed Jul 20 15:51:44 2022 -0700
committerRoman Kiryanov <rkir@google.com>Wed Jul 20 15:57:06 2022 -0700
tree4b0349f7355b21e150dd0c1f57fb6f9f964dfec0
parent0871db4b683fd1fc37747ba102abdaf664355b72 [diff]
Fix latency calculation (2)

Fix bad merge conflict resolution.

Bug: 239071306
Test: build
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I8070c417054181091325c108369db31b91ab4267
Merged-In: I8070c417054181091325c108369db31b91ab4267
1 file changed
tree: 4b0349f7355b21e150dd0c1f57fb6f9f964dfec0
  1. 64bitonly/
  2. audio/
  3. camera/
  4. car/
  5. data/
  6. dhcp/
  7. emulator64_arm64/
  8. emulator64_x86_64/
  9. emulator64_x86_64_arm64/
  10. fingerprint/
  11. fvpbase/
  12. gnss/
  13. input/
  14. input-mt/
  15. MultiDisplayProvider/
  16. overlay/
  17. qemu-adb-keys/
  18. qemu-device-state/
  19. qemu-props/
  20. qemud/
  21. radio/
  22. rro_overlays/
  23. sensors/
  24. sepolicy/
  25. slim/
  26. soundtrigger/
  27. tasks/
  28. tnc/
  29. tools/
  30. wifi/
  31. Android.bp
  32. Android.mk
  33. AndroidProducts.mk
  34. arm32-vendor.mk
  35. arm64-kernel.mk
  36. arm64-vendor.mk
  37. compatibility_matrix.xml
  38. display_settings.xml
  39. display_settings_freeform.xml
  40. emulator-info.txt
  41. fstab.goldfish
  42. fstab.ranchu
  43. fstab.ranchu.arm
  44. fstab.ranchu.arm.ex
  45. fstab.ranchu.early
  46. fstab.ranchu.early.arm
  47. fstab.ranchu.ex
  48. fstab.ranchu.initrd
  49. fstab.ranchu.initrd.arm
  50. fstab.ranchu.initrd.arm.ex
  51. fstab.ranchu.initrd.ex
  52. fstab.ranchu.initrd.noavb
  53. fstab.ranchu.initrd.noavb.ex
  54. fstab.ranchu.mips
  55. fstab.ranchu.noavb
  56. fstab.ranchu.noavb.ex
  57. fvp.mk
  58. fvp_mini.mk
  59. init.qemu-adb-keys.sh
  60. init.ranchu-core.sh
  61. init.ranchu-net.sh
  62. init.ranchu.rc
  63. init.system_ext.rc
  64. manifest.camera.xml
  65. manifest.xml
  66. METADATA
  67. minimal_system.mk
  68. OWNERS
  69. sdk_phone_x86_vendor.mk
  70. task_profiles.json
  71. ueventd.goldfish.rc
  72. ueventd.ranchu.rc
  73. vendor.mk
  74. x86-vendor.mk
  75. x86_64-kernel.mk
  76. x86_64-vendor.mk