Merge commit '3adf7678cdf8fa955627e096bb5c27b94adc3079'
* commit '3adf7678cdf8fa955627e096bb5c27b94adc3079':
Add permission test structure for private framework permissions.
Add <keygen> support for VPN.
Merge commit 'c2922687fa8f953cc1325a6416af5be43cb41fed'
* commit 'c2922687fa8f953cc1325a6416af5be43cb41fed':
Add more data to reliability test report, includes min, max, std, run data.
Merge commit '6c84343f0794c368e79c58b715ffad268b8e219c'
* commit '6c84343f0794c368e79c58b715ffad268b8e219c':
Use locale-appropriate formatting to display application sizes like "252KB".
Merge commit 'd83d6606d62e27effc27be48d6050914deefe9eb'
* commit 'd83d6606d62e27effc27be48d6050914deefe9eb':
Adjust order of file/section list in output diff
Merge commit '6d78dd8ef833e22d73fc65df205346e657cf9850'
* commit '6d78dd8ef833e22d73fc65df205346e657cf9850':
On the way of refactoring out SingleServerProfile.java.
+ Move mServerName from SingleServerProfile and VpnProfile.
+ Add mSavedUsername to VpnProfile.
+ Keep empty SingleServerProfile to not break the classes that use it.
+ Remove use of SingleServerProfile from VpnService.java.
Merge commit '3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40'
* commit '3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40':
AI 149839: make the home page's announcement block expandable...
Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'
* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
Fix some backup reader/writer issues; make local transport do backup
Fix the jni initializer.
Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
Fix bug #1812041: activity manager crash with bad args.
Journal backup requests so that they won't be lost in a crash
Fix data connection issues.
Merge commit '6599426f74371c823fcfe570f61577262eb0df44'
* commit '6599426f74371c823fcfe570f61577262eb0df44':
Make the date format preference work again.
Merge commit 'e8939bb8f1453b44788d4475a8263082d858e533'
* commit 'e8939bb8f1453b44788d4475a8263082d858e533':
AI 149797: Have SetupWizard pull the Terms of Service from the web using a new URL
Merge commit '110b50ca5158f75abdead740f0956600da2f212d' into donut
* commit '110b50ca5158f75abdead740f0956600da2f212d':
AI 149839: make the home page's announcement block expandable...
Merge commit '83bb56c389d003162093eef0aaee251cefc1deed'
* commit '83bb56c389d003162093eef0aaee251cefc1deed':
Add the VPN services package, VPN service base classes and L2tpIpsecService.
Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c'
* commit '78f0f8cb2efe9410127c39201e240f6d438eb53c':
Make the file backup helper not crash if a file you requested
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
Merge commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e'
* commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e':
Update control files (pass/fail/nontext/crash) to results from CRB45
Merge commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197'
* commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197':
Support SMS cell broadcasting for GSM in RIL.java
