Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 6e30a00c9694cdc4f1d7016473b0752598235561
commit6e30a00c9694cdc4f1d7016473b0752598235561[log] [tgz]
authorTreeHugger Robot <treehugger-gerrit@google.com>Fri Mar 09 15:01:42 2018 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Fri Mar 09 15:01:42 2018 +0000
tree6aec8967cc768db2b9004c0d5e772b6fcdba5e56
parenta9df845321eaab4b1e237eff6e47dbe3d7e41e1e [diff]
parent13fb1dd780018d4f947cf9cc63351138e7a19c75 [diff]
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into oc-dev

* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2 am: 4b71619f50 skipped: d56e2e2cd0
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2 am: 4b71619f50
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
tree: 6aec8967cc768db2b9004c0d5e772b6fcdba5e56
  1. apct-tests/
  2. api/
  3. cmds/
  4. core/
  5. data/
  6. docs/
  7. drm/
  8. graphics/
  9. keystore/
  10. legacy-test/
  11. libs/
  12. location/
  13. media/
  14. native/
  15. nfc-extras/
  16. obex/
  17. opengl/
  18. packages/
  19. proto/
  20. rs/
  21. samples/
  22. sax/
  23. services/
  24. telecomm/
  25. telephony/
  26. test-runner/
  27. tests/
  28. tools/
  29. vr/
  30. wifi/
  31. Android.bp
  32. Android.mk
  33. CleanSpec.mk
  34. compiled-classes-phone
  35. MODULE_LICENSE_APACHE2
  36. NOTICE
  37. pathmap.mk
  38. preloaded-classes
  39. PREUPLOAD.cfg