diff options
| author | Kenny Root <kroot@google.com> | 2013-04-15 21:54:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-15 21:54:52 -0700 |
| commit | 738660894de6b5a32436794de7405e8c52c0a7f8 (patch) | |
| tree | 64e96f0e1d28867c6590d67a1f2605a036a845c5 /docs/html/sdk/api_diff/4/changes | |
| parent | f63d3c64cb714e327097adef930dae09115f59a2 (diff) | |
| parent | 49f0a5df739d2da22f24ac14fe430adaffa13f3b (diff) | |
am 49f0a5df: resolved conflicts for merge of 6a67a38f to jb-mr2-dev-plus-aosp
* commit '49f0a5df739d2da22f24ac14fe430adaffa13f3b':
AndroidKeyStore: Add encrypted flag
Diffstat (limited to 'docs/html/sdk/api_diff/4/changes')
0 files changed, 0 insertions, 0 deletions