Jake Hamby 9cc7ca2996 resolved conflicts for merge of 8f12b128 to master ...

Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df

2012-06-25 18:14:06 -07:00

res

resolved conflicts for merge of 8f12b128 to master

2012-06-25 18:14:06 -07:00

src/com/android/settings

resolved conflicts for merge of 8f12b128 to master

2012-06-25 18:14:06 -07:00

tests

Import revised translations.

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

Android.mk

Rework manage applications to be page-able.

2012-05-16 19:31:07 -07:00

AndroidManifest.xml

UI to add a photo to a user's profile.

2012-06-12 18:18: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%