diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2011-01-19 22:41:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-19 22:41:20 -0800 |
| commit | 71196f0cb3406cc4b0b82643ca08b59a97bc4cc8 (patch) | |
| tree | 8f11be0f4953e1370d0789d5774e4eaf524246e5 /keystore/java/android/security/Credentials.java | |
| parent | 242d556c983a370ee4fec53154d1ef8b04276eb7 (diff) | |
| parent | 6b818de29a5c273aad99eb3f5456f88169c911f4 (diff) | |
Merge "Make VpnService synchronous API." into honeycomb
Diffstat (limited to 'keystore/java/android/security/Credentials.java')
0 files changed, 0 insertions, 0 deletions