The Android Automerger 8a6f447fbf merge in master-release history after reset to master

2014-03-12 05:50:39 -07:00

res

Import translations. DO NOT MERGE

2014-03-10 15:39:07 -07:00

src/com/android/settings

am 677f32b1: am d4cf5c55: am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""

2014-03-11 15:21:11 +00:00

tests

Use Drawer in Settings app

2014-02-03 16:36:46 -08:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

Fix bug #13322417 stability-sys: Java crash in com.android.settings:

2014-03-07 11:18:36 -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%