OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0b5c2d 3aaa23e)
Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-mr1-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)
* changes:
  [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


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help