Elliott Hughes 98d9380a5c am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master ...

* commit '680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
  Stop hard-coding sample 12- and 24-hour times.

2012-09-06 16:37:44 -07:00

res

resolved conflicts for merge of 33f86196 to stage-aosp-master

2012-09-06 16:09:04 -07:00

src/com/android/settings

resolved conflicts for merge of 33f86196 to stage-aosp-master

2012-09-06 16:09:04 -07:00

tests

Import revised translations.

2011-11-29 11:19:18 -08:00

Android.mk

Use telephony-common

2012-07-11 15:08:15 -07:00

AndroidManifest.xml

Add back a SYNC_SETTINGS screen

2012-06-06 20:55:40 -07: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

User management screens

2012-03-27 12:06:29 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%