Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 1b6a8f87403703d9e8ded269208adcb5eb00c5db
commit1b6a8f87403703d9e8ded269208adcb5eb00c5db[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Jul 13 14:04:34 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Jul 13 14:04:34 2020 +0000
tree8c4d5700f85fba1cb1108c1bb2d321864e69811b
parent9a6923b274f702644282e2d296d7d9d726d0ff4f [diff]
parentf8df6534c953110a84946a2a1adfe9c69761ab10 [diff]
Merge "[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5caa -s ours am: 40f9b161e8 -s ours am: df647b5aa2 -s ours" into rvc-qpr-dev-plus-aosp am: f8df6534c9 -s ours

am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 e6317e5caa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906

Change-Id: Iecfde7015fb67a4066697e95b80d70c71a09d177
tree: 8c4d5700f85fba1cb1108c1bb2d321864e69811b
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. cmds/
  6. config/
  7. core/
  8. data/
  9. docs/
  10. drm/
  11. errorprone/
  12. graphics/
  13. identity/
  14. keystore/
  15. libs/
  16. location/
  17. lowpan/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc-extras/
  23. non-updatable-api/
  24. obex/
  25. opengl/
  26. packages/
  27. proto/
  28. rs/
  29. samples/
  30. sax/
  31. services/
  32. startop/
  33. telecomm/
  34. telephony/
  35. test-base/
  36. test-legacy/
  37. test-mock/
  38. test-runner/
  39. tests/
  40. tools/
  41. wifi/
  42. .clang-format
  43. .gitignore
  44. .mailmap
  45. Android.bp
  46. Android.mk
  47. ApiDocs.bp
  48. CleanSpec.mk
  49. diff
  50. framework-jarjar-rules.txt
  51. METADATA
  52. MODULE_LICENSE_APACHE2
  53. NOTICE
  54. pathmap.mk
  55. PREUPLOAD.cfg
  56. StubLibraries.bp
  57. TEST_MAPPING