frameworks_base/packages at a77c9541d008cfffed71cb8e3a9382001cf7fe9c - frameworks_base - BlackGit

Android/frameworks_base

Files

History

Gilles Debunne 09f1612885 resolved conflicts for merge of 8064dd22 to master

Change-Id: Iff7f729d1e375902a8d89bb237694913380b0d36

2010-09-30 11:50:52 -07:00

..

DefaultContainerService

resolved conflicts for merge of d8e8186c to master

2010-09-28 18:16:50 -07:00

SettingsProvider

am 6c48f228: am 0cd28fdd: Merge "Use the default SecureRandom provider." into gingerbread

2010-09-24 15:57:16 -07:00

resolved conflicts for merge of 8064dd22 to master

2010-09-30 11:50:52 -07:00

am 3b197dfc: am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread

2010-09-30 11:27:47 -07:00

Trim unwanted whitespace from translations. DO NOT MERGE

2010-09-27 14:41:54 -07:00