| commit | 5bbe13bdc4470d0af2786fc62ad40a8ba8ff5830 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Tue May 17 16:19:40 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 17 16:19:40 2016 +0000 |
| tree | 5f15c2d0cec942ae77bdaa83abf2ec57abe0df06 | |
| parent | 7ad3c888e2781321cf44cb101cdf180a9671ca1e [diff] | |
| parent | 6c84ef62d953eae93c36ffa831e9b451560afba0 [diff] |
Merge "Drop PROHIBIT_NON_VPN priority 11500 -> 12500" into nyc-dev