OSDN Git Service

Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev
authorRobin Lee <rgl@google.com>
Fri, 27 May 2016 02:39:45 +0000 (02:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 02:39:45 +0000 (02:39 +0000)
am: 33154deb70

* commit '33154deb700a8cf5df6fff39f0b3291d1278efa0':
  Check if we're connected before marking a UID blocked

Change-Id: I7a2552f43c66b1b1adb094d3b91ef87648e57bde


Trivial merge