Google GitGoogle Git
Sign in
android/device/google/cuttlefish/a4dc9bb5ba2a076bba68d9039106c246b81ce62a
commit
a4dc9bb5ba2a076bba68d9039106c246b81ce62a
[log]
author
Greg Hartman <ghartman@google.com>
Mon Aug 12 12:38:25 2019 -0700
committer
Greg Hartman <ghartman@google.com>
Mon Aug 12 12:38:29 2019 -0700
tree
b1202219a7e577275ddefc987c6fe48f6d22ed3d
parent
2a5754bd727df27b8738f489bae6bb1264d1a0c0 [diff]
parent
75bcaf7d9df9d30b8e6e922eabae7a85a638d28d [diff]
resolve merge conflicts of 75bcaf7d9df9d30b8e6e922eabae7a85a638d28d to master

Test: compiles
Bug: None
Change-Id: I985ecdec8dc837c7e3e82ea240a60a07a393705a
tree: b1202219a7e577275ddefc987c6fe48f6d22ed3d
  1. shared/
  2. tests/
  3. vsoc_arm64/
  4. vsoc_x86/
  5. vsoc_x86_64/
  6. vsoc_x86_noapex/
  7. Android.bp
  8. Android.mk
  9. AndroidProducts.mk
  10. CleanSpec.mk
  11. fetcher.mk
  12. host_package.mk
  13. OWNERS