OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a9df845 13fb1dd)
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)
commit6e30a00c9694cdc4f1d7016473b0752598235561
tree6aec8967cc768db2b9004c0d5e772b6fcdba5e56tree | snapshot
parenta9df845321eaab4b1e237eff6e47dbe3d7e41e1ecommit | diff
parent13fb1dd780018d4f947cf9cc63351138e7a19c75commit | 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
frameworks/base
About OSDN
Find Software
Develop Software
Help