Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / f10f5eb3904c55fa2ca419a276cbc08a2dcec406
commitf10f5eb3904c55fa2ca419a276cbc08a2dcec406[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Aug 03 22:03:43 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Aug 03 22:03:43 2020 +0000
tree5430ad18d04cb520c804f02efe7ded7c8afde45a
parent0fac0c27c83dc92316a8286da8da34f6be13635f [diff]
parentda8928b7054e7a2c6c1e726bb7818894d34cb36a [diff]
Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours" into rvc-dev-plus-aosp am: 4f547ed394 -s ours am: da8928b705 -s ours

am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 9d7ff99a07 is in history

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

Change-Id: Ib217f70780c55828d2705f856af135db53e87710
tree: 5430ad18d04cb520c804f02efe7ded7c8afde45a
  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