Elliott Hughes 78f5c4d537 am 76ddf411: Merge "Fix /proc/version parsing in Settings." ...

* commit '76ddf4113ab73acfd3d6172a8965bffec2e7c60f':
  Fix /proc/version parsing in Settings.

2012-09-10 19:02:47 -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

am 76ddf411: Merge "Fix /proc/version parsing in Settings."

2012-09-10 19:02:47 -07:00

tests

Fix /proc/version parsing in Settings.

2012-09-10 17:58:15 -07:00

Android.mk

Use telephony-common - DO NOT MERGE

2012-07-17 12:23:26 -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%