summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2014-03-13 18:30:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 18:30:28 +0000
commit0b925975b88c91285df97ca26cebb8f8429ec0da (patch)
treedfad13ea92cd21f28bb22412c786a87479784b32 /core/java
parent6467e900a1211de65ae70cc722c871987e0b6531 (diff)
parent48dd8b0fc0090ebf6cef0a9ac045fc480dd31397 (diff)
downloadframeworks_base-0b925975b88c91285df97ca26cebb8f8429ec0da.zip
frameworks_base-0b925975b88c91285df97ca26cebb8f8429ec0da.tar.gz
frameworks_base-0b925975b88c91285df97ca26cebb8f8429ec0da.tar.bz2
am 48dd8b0f: am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '48dd8b0fc0090ebf6cef0a9ac045fc480dd31397': Only allow System apps to make VPN exempt routes
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions