tree 041c5e20ab5673df401f3336ded26f0fd88e94e0
parent 7819e1d72cb1a6ddf605618d02a6d4f560b3da10
parent c821261345e3b4ac82a2ea5c91c53013d4ab1c99
author Jim Miller <jaggies@google.com> 1273598886 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273598886 -0700

am c8212613: am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo