Andrew Sapperstein 00da81fe54 Merge "Merge "Update background ANR setting text" into pi-dev am: 948e1c502f" into pi-dev-plus-aosp ...

am: e632b53421

Change-Id: I2525f05928b622f55021522585c9b38a6651cfea

2018-03-07 04:57:05 +00:00

..

res

Merge "Update background ANR setting text" into pi-dev

2018-03-07 02:52:42 +00:00

src/com/android/settingslib

Merge "Add default implementation to handle master dev option switch."

2018-03-01 02:38:47 +00:00

tests

Merge "Add default implementation to handle master dev option switch."

2018-03-01 02:38:47 +00:00

Android.mk

Use the correct prebuilts for lifecycles.

2018-01-26 23:20:09 +00:00

AndroidManifest.xml

…

common.mk

Always get Support Library resources from prebuilts

2018-03-05 14:59:31 -05:00

OWNERS

Add OWNERS for settingslib

2017-10-24 10:17:10 -07:00