Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 717f846e63f4e576cc46744634c3205156a8a846
commit717f846e63f4e576cc46744634c3205156a8a846[log] [tgz]
authorIan Kasprzak <iankaz@google.com>Wed Aug 28 21:07:15 2019 -0700
committerandroid-build-merger <android-build-merger@google.com>Wed Aug 28 21:07:15 2019 -0700
tree2c0bb00db0e872ed4c0b454bba3e638d400cf1bf
parent525ef5d57b8dfef14c03b0aa1d3ef75d53ef27be [diff]
parent2b7053a0bd76d2b93e292d60d293c6719ac53185 [diff]
[automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a025 -s ours am: 0cd1fdd617 am: 489edfda20
am: 2b7053a0bd -s ours
am skip reason: subject contains skip directive

Change-Id: I0256a2e2638a3c012b33d91bbe2af76855c7f785
tree: 2c0bb00db0e872ed4c0b454bba3e638d400cf1bf
  1. apct-tests/
  2. apex/
  3. api/
  4. cmds/
  5. config/
  6. core/
  7. data/
  8. docs/
  9. drm/
  10. graphics/
  11. keystore/
  12. libs/
  13. location/
  14. lowpan/
  15. media/
  16. mime/
  17. native/
  18. nfc-extras/
  19. obex/
  20. opengl/
  21. packages/
  22. proto/
  23. rs/
  24. samples/
  25. sax/
  26. services/
  27. startop/
  28. telecomm/
  29. telephony/
  30. test-base/
  31. test-legacy/
  32. test-mock/
  33. test-runner/
  34. tests/
  35. tools/
  36. wifi/
  37. .gitignore
  38. Android.bp
  39. Android.mk
  40. CleanSpec.mk
  41. jarjar_rules_hidl.txt
  42. MODULE_LICENSE_APACHE2
  43. NOTICE
  44. pathmap.mk
  45. PREUPLOAD.cfg