commit | 6d248625d3173fc6d7483ace84f44fda0bd2efb2 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Fri Mar 01 01:03:27 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 01 01:03:27 2013 +0000 |
tree | d6c080cbab5daff8f188731d77f566e712d04a46 | |
parent | ce43e009e648687993c7ee85c0cb9be1b60319a8 [diff] | |
parent | 7f61d0146e48275bf372e6b1ea82d2f48163c73d [diff] |
am 7f61d014: Merge "Allow loopback traffic in lockdown mode." into jb-mr2-dev * commit '7f61d0146e48275bf372e6b1ea82d2f48163c73d': Allow loopback traffic in lockdown mode.