Elliott Hughes 0c0d605231 am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master ...

* commit '105d879ccef2517a07a15f29b956be739504fa73':
  Stop hard-coding sample 12- and 24-hour times.

2012-09-06 16:41:35 -07:00

res

am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master

2012-09-06 16:39:41 -07:00

src/com/android/settings

am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master

2012-09-06 16:39:41 -07:00

tests

Import translations. DO NOT MERGE

2012-07-13 13:12:21 -07:00

Android.mk

Use telephony-common

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

AndroidManifest.xml

Make manage apps UI multi-user aware.

2012-08-21 11:14:04 -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%