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

am: c0e015a495

* commit 'c0e015a495ff27002d9ad544bc32f9edff47da83':
  Guard against monkey crash

2016-02-25 21:04:16 +00:00

..

res

Merge "Add fallback packages to be enabled iff no webview packages are valid" into nyc-dev

2016-02-24 19:10:12 +00:00

src/com/android/settingslib

Guard against monkey crash

2016-02-25 13:07:41 -05:00

tests

…

Android.mk

Move restricted padlock support to SettingsLib

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

AndroidManifest.xml

…

common.mk

…