app_Settings

Go to file

Anna Galusza b95de86ae3 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

am: 8e13f72

* commit '8e13f725dc1f1bad626410a5accdbf52bf5b6fc7':
  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: Ifee675dfc34c5233af5c2f4f90d8ccef2a6535cc

2016-04-06 17:51:21 +00:00

res

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

2016-04-06 17:51:20 +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 am: a3d8c31

2016-04-06 17:51:21 +00:00

tests

Import translations. DO NOT MERGE

2016-03-18 20:52:22 -07:00

Android.mk

Merge "Add suggestion carousel view and dependencies to settings"