Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 94e03f470f72f8e681e645fdd187eb7dced03624
commit94e03f470f72f8e681e645fdd187eb7dced03624[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Jul 16 09:01:21 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Jul 16 09:01:21 2020 +0000
tree967c17b3e82533006826f05c48d29e96ed6eb5d1
parenteb35fc2f234a630a2970c318441f8df85bb3beb6 [diff]
parent3bbe410fd48352afc6f3aa2e2a8e33b2364e30b5 [diff]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 345a4d331f -s ours am: 47b34e44c3 -s ours am: 56a36854c2 -s ours" into rvc-qpr-dev-plus-aosp am: 3bbe410fd4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If8b2d3b1d6fef454e97d70dc87501458d9a6c295
tree: 967c17b3e82533006826f05c48d29e96ed6eb5d1
  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