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