app_Settings

Go to file

Anna Galusza 8e13f725dc Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev

am: a3d8c31

* commit 'a3d8c316d4902edb97fe6c5c257a47406b1c30bb':
  Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed.

Change-Id: I9ef886bd7bdad975a55411ed5830837f3d965f0f

2016-04-06 17:48:16 +00:00

res

Merge "Use normal button style for Clear data / cache buttons" into nyc-dev

2016-04-06 17:45:19 +00:00

src/com/android/settings

Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev

2016-04-06 17:48:16 +00:00

tests

Import translations. DO NOT MERGE

2016-02-03 06:44:39 -08:00

Android.mk

Revert "Revert "Use SetupWizardPreferenceLayout""