| commit | 8b609f3a96f9576c258ffd38cea2853cd2129ebf | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Wed Mar 02 00:52:34 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 02 00:52:35 2016 +0000 |
| tree | 34164ae81a2b85d2087817421ba626700387d220 | |
| parent | 8e28443aa7263d4d7a78f39fab32176505e3506d [diff] | |
| parent | 258be56dcddd414e101dc3eb2853b0abd7cf1423 [diff] |
Merge "Make preferred activities encryption aware." into nyc-dev