OSDN Git Service

am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources...
authorJim Miller <jaggies@google.com>
Tue, 11 May 2010 17:23:42 +0000 (10:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 May 2010 17:23:42 +0000 (10:23 -0700)
commit522fb399abb6653912ae51066adba59922a9df95
treeb013fbb9d1d2f493488ba7f3fcebca98f88110c1
parent8ccfd2eeeb992278267d18bedbb55530d4100c04
parent0528895b0dcdbd9d45cd6f51ae2a1017d15ca6d1
am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo

Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken

* commit '4d89954dc4572a05339dc7a95ec683892558162b':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads