tree 9a2291eb901d4de7d78a58c7b898144e505c0e88
parent e44e754166ad8c53781f67b2e814012fb5dbeae3
parent effacfa75bd9c2ebc889a7bc4f002c07f82f4c31
author Matthew Williams <mjwilliams@google.com> 1402359844 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402359845 +0000

Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev