Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / afb3acf1009dcc13c0bce027b7b9c4e29ab10fb4
commitafb3acf1009dcc13c0bce027b7b9c4e29ab10fb4[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Jul 17 04:50:02 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Jul 17 04:50:02 2020 +0000
tree4be95f617ba8a9bed8b3f4a3dca9c2a057533209
parent6c45f6ffc88c45b2a9ae69610bcca3b9b71dec0a [diff]
parent5d508893638ece0696c81554f12cb93e368ab03c [diff]
[automerger skipped] Merge changes from topic "am-3081ec444acb4d69974a1b8546d081d1" into rvc-qpr-dev-plus-aosp am: 5d50889363 -s ours

am skip reason: Change-Id I7d98ab425852ffa064c68f5dc50bd1f5a4a49ab9 with SHA-1 472144c35a is in history

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

Change-Id: I0b1cd2d835c74dd9dcbfc636a61960d7783350f7
tree: 4be95f617ba8a9bed8b3f4a3dca9c2a057533209
  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