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