diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-26 15:23:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-26 15:23:39 -0700 |
| commit | ab33d668ff5bb4466c58d6ab5457080cfe76ff07 (patch) | |
| tree | 02609f8f45a71a21089161a293538d31eda76f87 /docs/html/sdk/api_diff/7 | |
| parent | 629e0dcb3948f89a9acb02aca9f2de1c31d7e7c6 (diff) | |
| parent | 17671ff0440159e3e529ff12c0f6b445e0d84302 (diff) | |
am 17671ff0: am ba0372db: Merge "Parcel VpnProfile without using disk format." into jb-mr1-dev
* commit '17671ff0440159e3e529ff12c0f6b445e0d84302':
Diffstat (limited to 'docs/html/sdk/api_diff/7')
0 files changed, 0 insertions, 0 deletions