| commit | dfa5bc90f837326c5175ce3d68ddba838b740ae8 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Fri May 27 16:57:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 27 16:57:47 2016 +0000 |
| tree | 217a62549bfd469460e2911e2485b8a665a74d6f | |
| parent | f9e39512a968f8bb1a81fff81092068a16830f7e [diff] | |
| parent | b3f3f26046103461067101e5bfb8416a4285a776 [diff] |
Merge "Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb70 am: 174385a208" into nyc-mr1-dev-plus-aosp am: b3f3f26046 * commit 'b3f3f26046103461067101e5bfb8416a4285a776': Change-Id: I76ffb65c583312c63937f9e7d77432cadafff355