| commit | 40e6194148cc89e140cdaa9dc28d24cdf5acdc37 | [log] [tgz] |
|---|---|---|
| author | Greg Kaiser <gkaiser@google.com> | Mon Aug 29 17:48:45 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 29 17:48:48 2016 +0000 |
| tree | be308a51c37764f6de70a2a2e59e53c6e7237a4d | |
| parent | 143aaa6d05332515afca4977d29bcfc66c015d27 [diff] | |
| parent | 29e868071d64ebbcf6191bb5b7542875ad6fcef8 [diff] |
Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev