app_Settings

Go to file

Yohei Yukawa 7c4499da26 Support ACTION_KEYBOARD_LAYOUT_SETTINGS.

This CL let the Settings app accept
Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS like other activity actions
such as ACTION_INPUT_METHOD_SETTINGS and
ACTION_INPUT_METHOD_SUBTYPE_SETTINGS.

Bug: 25752827
Change-Id: I3244d9af400f9344359c1b5cfc1a5c1d9268ec8c

2016-01-27 19:18:52 -08:00

res

Merge changes Id18f3e9f,I737736d6

2016-01-27 20:34:44 +00:00

src/com/android/settings

Merge changes Id18f3e9f,I737736d6

2016-01-27 20:34:44 +00:00

tests

Merge "Add SmallTest annotation to UserCredentialsTest"

2016-01-26 09:30:49 +00:00

Android.mk

resolve merge conflicts of bdc6074276 to master.