summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2015-01-22 07:18:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-22 07:18:00 +0000
commit61b07b4016ebdbfe7215c0cc03fd65ddf55c6703 (patch)
tree829deb3bfc95013fafd9d38a365e0decaf78e7ec /core/java/com
parent54dbd1fd437862346f7cdacc484acd3e10501bfb (diff)
parent4f3615036db441c4a099dc789ebcdf641ac5a987 (diff)
downloadframeworks_base-61b07b4016ebdbfe7215c0cc03fd65ddf55c6703.zip
frameworks_base-61b07b4016ebdbfe7215c0cc03fd65ddf55c6703.tar.gz
frameworks_base-61b07b4016ebdbfe7215c0cc03fd65ddf55c6703.tar.bz2
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 147cf4b
automerge: 4f36150 * commit '4f3615036db441c4a099dc789ebcdf641ac5a987': Log interface name and uid when filtering a blocked network.
Diffstat (limited to 'core/java/com')
0 files changed, 0 insertions, 0 deletions