app_Settings

Go to file

Jorim Jaggi 74a2283d24 Finish trampoline activity for ConfirmDeviceCredential immediately

Make sure to finish ConfirmDeviceCredentialActivity directly, and use
Intent.FLAG_ACTIVITY_FORWARD_RESULT, so we can't even end up in a
state where we have the trampoline activity but not the real activity.

Bug: 23849216
Change-Id: I7a5be5af74ca85c11df1f61a69c3fd5cf558e1fb

2015-09-10 20:14:06 -07:00

res

Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev

2015-09-10 00:25:59 +00:00

src/com/android/settings

Finish trampoline activity for ConfirmDeviceCredential immediately

2015-09-10 20:14:06 -07:00

tests

Import translations. DO NOT MERGE

2015-07-23 18:23:19 -07:00

Android.mk

Allow incremental builds for settings.