Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / b0d36350ad70bc2c7b03293d1ca30198143961b9
commitb0d36350ad70bc2c7b03293d1ca30198143961b9[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Sat Oct 31 03:47:52 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Sat Oct 31 03:47:52 2020 +0000
tree34cdc72ca65dc1ce56a614b78c74e9e4d8a5f54b
parentd11bf4a830316876ab5e8fec809c96c007c2b575 [diff]
parent68fdfc70c7c0a297d03a0f6e4f4c6b6d80e8517d [diff]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: b630b27967 -s ours am: 8ea3acc482 -s ours am: eed1931f4b -s ours" into rvc-qpr-dev-plus-aosp am: 68fdfc70c7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I909e5ce4246b664aefd4934f989ec73289011878
tree: 34cdc72ca65dc1ce56a614b78c74e9e4d8a5f54b
  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. obex/
  24. opengl/
  25. packages/
  26. proto/
  27. rs/
  28. samples/
  29. sax/
  30. services/
  31. startop/
  32. telecomm/
  33. telephony/
  34. test-base/
  35. test-legacy/
  36. test-mock/
  37. test-runner/
  38. tests/
  39. tools/
  40. wifi/
  41. .clang-format
  42. .gitignore
  43. .mailmap
  44. Android.bp
  45. Android.mk
  46. ApiDocs.bp
  47. CleanSpec.mk
  48. framework-jarjar-rules.txt
  49. METADATA
  50. MODULE_LICENSE_APACHE2
  51. NOTICE
  52. pathmap.mk
  53. PREUPLOAD.cfg
  54. StubLibraries.bp
  55. TEST_MAPPING