| commit | 463068b84c435599a3fcd5c3df02fe619d27ed29 | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Sep 23 14:58:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 14:58:13 2015 +0000 |
| tree | 65b92f7d2f0be1ca9e8b1271643ccbc3542232c0 | |
| parent | a61a2087f36dfec30da1b0db262c731aa03a4f30 [diff] | |
| parent | e284082595370a1ff990b4582dabd22f4a84e204 [diff] |
am e2840825: am 1904f9d4: am aa1b0618: am b7710d07: resolved conflicts for 70dd1f77 to lmp-sprout-dev * commit 'e284082595370a1ff990b4582dabd22f4a84e204': Fix NOT_RESTRICTED network capability and enforce it.