Jason Monk 30e0a4a48a resolve merge conflicts of 8e18934478 to master. ...

Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534

2015-10-20 14:29:43 -07:00

..

ImeiInformation.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

MigrateEstimateTask.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

PercentageBarChart.java

Iteration on multi-user storage UI.

2012-09-07 13:23:55 -07:00

PrivateVolumeForget.java

Make sure Fragments are public for FragMan to instantiate

2015-06-25 17:01:54 -07:00

PrivateVolumeFormat.java

Returning to wizard, enable migration.

2015-04-29 17:24:12 -07:00

PrivateVolumeSettings.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

PrivateVolumeUnmount.java

Format as public/private; follow refactoring.

2015-04-28 21:54:54 -07:00

PublicVolumeSettings.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

SimStatus.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

Status.java

resolve merge conflicts of 8e18934478 to master.

2015-10-20 14:29:43 -07:00

StorageItemPreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageSettings.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageSummaryPreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageUnmountReceiver.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageVolumePreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageWizardBase.java

am 31566703: am 600cfe2f: am a61c803e: am 7f3026c3: am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev

2015-07-30 19:59:20 +00:00

StorageWizardFormatConfirm.java

Use 'setup' header illust before selecting storage type.

2015-07-02 15:38:39 +09:00

StorageWizardFormatProgress.java

am bfee8b48: am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev

2015-10-16 16:33:53 +00:00

StorageWizardInit.java

am 29936b07: am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings

2015-07-24 04:50:00 +00:00

StorageWizardMigrate.java

Use 'setup' header illust before selecting storage type.

2015-07-02 15:38:39 +09:00

StorageWizardMigrateConfirm.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageWizardMigrateProgress.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageWizardMoveConfirm.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageWizardMoveProgress.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

StorageWizardReady.java

Use 'setup' header illust before selecting storage type.

2015-07-02 15:38:39 +09:00

UsbBackend.java

am cde29f77: am 618bc11b: am 72fecf9f: am d3c60afe: Include the usb data mode regardless of data role

2015-09-10 20:53:52 +00:00

UsbModeChooserActivity.java

resolved conflicts for merge of 1adca55f to mnc-dr-dev

2015-08-04 16:23:32 -04:00