summaryrefslogtreecommitdiffstats
path: root/core/java/android/inputmethodservice
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2014-03-13 18:18:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 18:18:40 +0000
commit74f99a4e904af56a62f86b81831c23c763b6001e (patch)
tree1e28d8daa0baac6545d7ef16580c19ef31fd2c04 /core/java/android/inputmethodservice
parentf5729a6a1573ba27f69a5c5dc144be3f8f60b026 (diff)
parent7fb074389370ac93afc5830189371dc3ec26265c (diff)
downloadframeworks_base-74f99a4e904af56a62f86b81831c23c763b6001e.zip
frameworks_base-74f99a4e904af56a62f86b81831c23c763b6001e.tar.gz
frameworks_base-74f99a4e904af56a62f86b81831c23c763b6001e.tar.bz2
am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '7fb074389370ac93afc5830189371dc3ec26265c': Only allow System apps to make VPN exempt routes
Diffstat (limited to 'core/java/android/inputmethodservice')
0 files changed, 0 insertions, 0 deletions