commit | e721c5e3a894c0d3c65e1668a7e3407cbc0c5a7b | [log] [tgz] |
---|---|---|
author | Chad Brubaker <cbrubaker@google.com> | Fri Mar 14 10:34:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 10:34:30 2014 +0000 |
tree | 9431aad5e4866c09b1968f7026701d814995d647 | |
parent | b9982a2f77c29ebdc42a7ee65e03b81dafcec983 [diff] | |
parent | 11a1d123e07a7ab60b57c09e0beee5e17c7f64c1 [diff] |
am 0b925975: (-s ours) am 48dd8b0f: am 11a1d123: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev * commit '0b925975b88c91285df97ca26cebb8f8429ec0da': Only allow System apps to make VPN exempt routes