Jake Wharton d51d5f5ce7 Merge "Correct directory location." into pi-dev ...

am: ffc100e665

Change-Id: Iea2d0627386b1410902d6c1ceff53c09aff984be

2018-03-09 19:32:13 +00:00

..

res

Merge "Fix duplicate text in battery string" into pi-dev

2018-03-07 18:28:34 +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 "Fix duplicate text in battery string" into pi-dev

2018-03-07 18:02:27 +00:00

Android.mk

Use the correct prebuilts for lifecycles.

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

AndroidManifest.xml

…

common.mk

Correct directory location.

2018-03-09 12:58:52 -05:00

OWNERS

Add OWNERS for settingslib

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