Robin Lee 3c77ef7f29 Merge "RejectedExecutionException in DataUsageLIst" am: 7a8121fdd9 am: 543a98806f ...

am: 1f9c67e982

Change-Id: I1d4c00df6867b9034b21d6d490323364f77c37db

2017-04-05 13:45:49 +00:00

..

AppDataUsage.java

resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp

2017-03-29 13:54:02 +01:00

AppDataUsageActivity.java

…

AppDataUsagePreference.java

RejectedExecutionException in DataUsageLIst

2017-03-30 23:22:02 +08:00

AppStateDataUsageBridge.java

…

BillingCyclePreference.java

Listen to mobile data enabled flag change.

2017-03-16 15:08:49 -07:00

BillingCycleSettings.java

Use consistent formatter to convert byte->MB->GB.

2017-01-24 11:50:27 -08:00

CellDataPreference.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

ChartDataUsagePreference.java

Switch references to colorError

2017-02-24 14:57:31 -05:00

CycleAdapter.java

…

DataSaverBackend.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

DataSaverPreference.java

…

DataSaverSummary.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

DataUsageBase.java

…

DataUsageEditController.java

…

DataUsageInfoController.java

…

DataUsageList.java

Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.

2017-03-21 22:31:58 +00:00

DataUsageMeteredSettings.java

Merge commit '11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf

2017-03-12 17:22:21 -06:00

DataUsagePreference.java

Log source with visibility change

2017-02-15 17:17:19 -08:00

DataUsageSummary.java

Update preference text for Network & internet screen.

2017-03-21 18:00:59 -07:00

NetworkRestrictionsPreference.java

…

SpinnerPreference.java

…

TemplatePreference.java

…

TemplatePreferenceCategory.java

Listen to mobile data enabled flag change.

2017-03-16 15:08:49 -07:00

UnrestrictedDataAccess.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00