tree ac4c952cddd4749460d01381deffcffcb5e25f21
parent 0f97b8fcbddbbd40f5cf45ba57a5d9db48a611a0
parent ebbcb54a4380239ea3d0c4d1a20cd6b3c9ec0590
author Robin Lee <rgl@google.com> 1464280936 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464280937 +0000

Merge "Check if we're connected before marking a UID blocked" into nyc-dev