| commit | 087ee8952e3b5ba739028b50c12efd23576bc43a | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Thu Jan 28 19:10:20 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 28 19:10:20 2016 +0000 |
| tree | de1ea784fcb0abd5f62c4674f015c7592799c675 | |
| parent | 65d56d36f29d99df8127da8383f0938f819a3944 [diff] | |
| parent | fd37abe9d5469f2b0d640c625f14b75cfe609711 [diff] |
Merge "Make PreferenceActivity/Fragment encryption ready."