diff options
author | Chad Brubaker <cbrubaker@google.com> | 2014-03-13 18:23:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 18:23:00 +0000 |
commit | 48dd8b0fc0090ebf6cef0a9ac045fc480dd31397 (patch) | |
tree | ba0468ff39fc0d32027e3445316946818043035c /core/java/android/inputmethodservice/KeyboardView.java | |
parent | 7f68f7f4a128538c1bbd33c82a40f0cc15994bf9 (diff) | |
parent | 74f99a4e904af56a62f86b81831c23c763b6001e (diff) | |
download | frameworks_base-48dd8b0fc0090ebf6cef0a9ac045fc480dd31397.zip frameworks_base-48dd8b0fc0090ebf6cef0a9ac045fc480dd31397.tar.gz frameworks_base-48dd8b0fc0090ebf6cef0a9ac045fc480dd31397.tar.bz2 |
am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '74f99a4e904af56a62f86b81831c23c763b6001e':
Only allow System apps to make VPN exempt routes
Diffstat (limited to 'core/java/android/inputmethodservice/KeyboardView.java')
0 files changed, 0 insertions, 0 deletions