diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-26 18:13:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-26 18:13:59 -0700 |
| commit | cb0a030f97f3e6972ea2e6a895dfe95b07fe3261 (patch) | |
| tree | 3bff28eb089b13ec1dee05f440d4113cf76b1888 /docs/html/sdk/api_diff/11 | |
| parent | 93fb8ad1182d959aaf1023911f59a3a6b6509889 (diff) | |
| parent | ab33d668ff5bb4466c58d6ab5457080cfe76ff07 (diff) | |
am ab33d668: am 17671ff0: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
* commit 'ab33d668ff5bb4466c58d6ab5457080cfe76ff07':
Diffstat (limited to 'docs/html/sdk/api_diff/11')
0 files changed, 0 insertions, 0 deletions