Geoff Mendal e93e1b86a6 am 4a74e076: (-s ours) am 03fe71ed: (-s ours) am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE ...

* commit '4a74e0761d6567ed3af5da86903e80d2dbf9cb78':
  Import translations. DO NOT MERGE

2015-07-24 04:50:07 +00:00

res

resolved conflicts for merge of 769ba03b to master

2015-07-23 21:43:07 -07:00

src/com/android/settings

am 104c3d3d: am ea80c4b2: am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev

2015-07-24 04:50:05 +00:00

tests

Import translations. DO NOT MERGE

2015-07-20 15:26:26 -07:00

Android.mk

Allow incremental builds for settings.

2015-04-24 14:35:02 -07:00

AndroidManifest.xml

Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...

2015-07-21 17:44:49 +01:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07: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

Add option to reset network settings to factory

2015-03-09 13:18:50 -07:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%