tree 7d9f5f2962c2bc2b43d43f2d793e2a4daf09962e
parent b1a90d3b1422b0eb469e8960e6398a49ec036e0b
parent 8be8df214189844d0782aba432b90d3706df8c4d
author Ben Gruver <bgruv@google.com> 1365457226 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365457226 +0000

Merge "Implement event logging for intent firewall" into jb-mr2-dev