app_Settings

Go to file

Clara Bayarri 7f2a013619 Make ChooseLockGeneric read the userId extra from the activitie's extras if there's no arguments

Some invocations of ChooseLockGeneric are done with arguments, but
when invoking it from FingerprintEnrollIntroduction we add the extra
to the activity intent so we need to support both.

Bug: 26901625
Change-Id: Iaabad18bf17160578f6b6d807dc6acfead1ba419

2016-02-08 14:16:24 +00:00

res

Merge "Make TetherSettings use the new tether api."

2016-02-05 18:14:50 +00:00

src/com/android/settings

Make ChooseLockGeneric read the userId extra from the activitie's extras if there's no arguments

2016-02-08 14:16:24 +00:00

tests

Import translations. DO NOT MERGE

2016-02-03 06:44:39 -08:00

Android.mk

Enable multi-dex for incremental settings builds