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