commit | a47785b9171dfc8b6db2605c6731126ed8c6dee4 | [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 | 693e8300c5b85083b0806abf506600cd98661f27 [diff] | |
parent | 51e6a21fc02c81d4e672200c36504fe628d07e70 [diff] |
am 0b925975: (-s ours) am 48dd8b0f: am 51e6a21f: 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