Andrew Sapperstein b9453be364 resolve merge conflicts of 4e10b37 to master ...

Change-Id: If5091133617285fdb7f3c0312e9e229ae8e53fe0

2016-12-20 15:31:32 -08:00

..

res

Add flags to send package name for feedback.

2016-12-20 23:03:26 +00:00

src/com/android/settingslib

Add flags to send package name for feedback.

2016-12-20 23:03:26 +00:00

tests

resolve merge conflicts of 4e10b37 to master

2016-12-20 15:31:32 -08:00

Android.mk

SettingsLib: Update Android.mk to include test package makefile.

2016-09-07 18:35:02 -07:00

AndroidManifest.xml

…

common.mk

…