Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 30ae7a4351fed91b2f88960adbf441ca77b5aaa0
commit30ae7a4351fed91b2f88960adbf441ca77b5aaa0[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Oct 22 22:49:22 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Oct 22 22:49:22 2020 +0000
treea56e81860353db890808389d8d62c8b848737baa
parent27bb0fe61439cd8e22794eb3c9002700f896fb04 [diff]
parent607f8a24c8e32b3a3d239b1f1ac94a10d246f1ec [diff]
[automerger skipped] Merge changes from topic "am-b83fc5b0dcfc43208a9ca1af164efd6e" into stage-aosp-master am: b7357aca03 -s ours am: 70ad24f2df -s ours am: 607f8a24c8 -s ours

am skip reason: Change-Id I9aa69c9bd8d31e6bbdd9a237b0aa2c3922431227 with SHA-1 9d30001ad7 is in history

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

Change-Id: I0cb8f3a8d34fb46ed5c4dd1487589b47cfdec784
tree: a56e81860353db890808389d8d62c8b848737baa
  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. framework-jarjar-rules.txt
  50. METADATA
  51. MODULE_LICENSE_APACHE2
  52. NOTICE
  53. pathmap.mk
  54. PREUPLOAD.cfg
  55. StubLibraries.bp
  56. TEST_MAPPING