| commit | aa1b0618a847ee1365c1e9810f085214c717a27e | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Sep 23 14:39:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 14:39:22 2015 +0000 |
| tree | 8c3dce85f5f48d6db03511bece5485fe56d67d8a | |
| parent | 9497ef73bcac42e27f98804b3d508fea8e55ebd4 [diff] | |
| parent | b7710d07a501d5514f1242cb586aaeb53ac3ad2d [diff] |
am b7710d07: resolved conflicts for 70dd1f77 to lmp-sprout-dev * commit 'b7710d07a501d5514f1242cb586aaeb53ac3ad2d': Fix NOT_RESTRICTED network capability and enforce it.