The Android Open Source Project 9a2548db22 am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge ...

* commit '8c1845a6d669b03c2827965042f2e47e49f2d6b1':

2013-08-08 16:58:45 -07:00

res

am 05e2459f: am 82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev

2013-08-08 16:58:43 -07:00

src/com/android/settings

Merge "Developer option to force RTL layout direction" into klp-dev

2013-08-08 20:46:24 +00:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

Merge "Finished the location settings"

2013-08-08 00:55:39 +00: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

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%