| commit | 4f15f2ba67b6bc0ddad53b42235ac86d1079bbba | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Tue Feb 09 21:59:03 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 09 21:59:04 2016 +0000 |
| tree | 47e3242796eabfe4e66c9301f90b4f235d38a4d6 | |
| parent | ae8e0900047253168ad8e62f83e67bd2841f8791 [diff] | |
| parent | 58482c55d0848f9675b551cf2fea4990336f0b31 [diff] |
Merge "Make ServiceWatcher encryption-aware." into nyc-dev