Google Git
Sign in
android / platform / frameworks / base / 054e5a3b132c24eeba45207cd3eec0225e1d46f6
commit054e5a3b132c24eeba45207cd3eec0225e1d46f6[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Mar 04 17:58:36 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Mar 04 17:58:36 2020 +0000
treeb4ed47fe6dcae7ac5987b1f2c9b4689edb58a2db
parent491b2c95feff991f91e999d0cbb063fb2bdad247 [diff]
parent33c4d5c99ba276056097693d0d6454bb6b9c823f [diff]
Merge "[automerger skipped] Merge "Move DnsSdTxtRecord to net common static library" am: 8d6a6e0d4b am: 465199b9a0 -s ours am: 09cf091a6a -s ours am: 7cd5975424 -s ours am skip reason: change_id I6118b313ce668707d598aa2eab9baee2f7622dbc with SHA1 3587754f22 is in history" into rvc-qpr-dev-plus-aosp am: 33c4d5c99b -s ours
am skip reason: Change-Id I6118b313ce668707d598aa2eab9baee2f7622dbc with SHA-1 3587754f22 is in history

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