tree 4d292d9df35391cd5a3e8a2208d3e4f5955cdd7a
parent 83131db9a8ff490f936c4c962b31c28f67cb7ad0
parent 367d15ab1a33b6159447fa8542d4fa8ff148371c
author Jeff Sharkey <jsharkey@android.com> 1317019450 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317019450 -0700

Merge "Watch network subtype, tethering teardown, empty."