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

* commit 'c3835eae2336e3d42e28f0a8c712238e4fe12701':

2013-12-05 22:45:18 +00:00

res

Add preference for caption text opacity

2013-12-05 11:27:40 -08:00

src/com/android/settings

Add preference for caption text opacity

2013-12-05 11:27:40 -08:00

tests

Import translations. DO NOT MERGE

2013-09-09 13:34:45 -07:00

Android.mk

The Settings app needs privileged permissions

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

AndroidManifest.xml

Remove extra fragment in captioning preferences

2013-12-04 17:19:24 -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%