tree 63f0ab3de5b17d54988f960832ce4bd745951758
parent 1b8f499a14a4340d3422d95c7f6fdc8c0c72b3a4
parent 3bc9a79fe83d19d4701bd6035fd30d83f267906e
author Robert Greenwalt <rgreenwalt@google.com> 1335391923 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335391923 -0700

Merge "Add bit to eventlog to handle new network types" into jb-dev