Jason Monk e80919385a Merge "Guard against monkey crash" into nyc-dev ...

am: c8bac80390

* commit 'c8bac80390653f9ead129000f52e75f4be826f50':
  Guard against monkey crash

2016-02-11 17:07:38 +00:00

..

res

Import translations. DO NOT MERGE

2016-02-10 07:36:12 -08:00

src/com/android/settingslib

Guard against monkey crash

2016-02-11 11:37:24 -05:00

tests

…

Android.mk

Move restricted padlock support to SettingsLib

2016-01-12 18:14:24 +00:00

AndroidManifest.xml

…

common.mk

…