Jeff Sharkey 0cd68e04a9 am 859909fe: am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor" ...

* commit '859909fee87d4dab6964977834a780acfd2310b2':
  Fix null pointer exceptions in NetworkPolicyEditor

2014-01-10 23:11:35 +00:00

res

Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD

2013-12-05 12:38:23 -08:00

src/com/android/settings

am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"

2014-01-10 15:08:40 -08:00

tests

Import translations. DO NOT MERGE

2013-09-14 21:12:30 -07:00

Android.mk

The Settings app needs privileged permissions

2013-06-17 11:43:23 -07:00

AndroidManifest.xml

Integrate remote display routes into screen cast settings UI.

2013-11-10 21:20:16 -08:00

CleanSpec.mk

Add an empty CleanSpec.mk

2010-03-08 18:05:08 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

proguard.flags

NFC payment settings.

2013-08-06 19:16:54 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%