Google Git
Sign in
android / platform / frameworks / base / d3579addfabdc0f236b55955b6644cb427e16afb
commitd3579addfabdc0f236b55955b6644cb427e16afb[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Mar 11 10:07:43 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Mar 11 10:07:43 2020 +0000
tree649277fd2f3478c87eece21225a9af4ee7574820
parent8e258a182bb3d21390c2dc14f22d1cef7da37ddb [diff]
parentfee7e9913bf3e7e21b817dee93c24d9146202aca [diff]
[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ffac am: 8d37b54e76 -s ours am: e776ad2c63 -s ours am: fee7e9913b -s ours

am skip reason: subject contains skip directive

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