| commit | a3c6faaa400b207ce642b5ff7f7d7f683e9ca5bb | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Aug 27 10:19:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:19:13 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | 0d164952253e58f7cef8f0ad6da0afd406ef98fb [diff] | |
| parent | 6ceed53eeb6d14bb5dbf1f5ae719ad2722de9fb5 [diff] |
am 6ceed53e: (-s ours) am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev * commit '6ceed53eeb6d14bb5dbf1f5ae719ad2722de9fb5':