tree d0626926c0e879e00b323132b1c6eafab0ea9bbc
parent a97d2ef9b3979a25e3ca649e25ae00c9c95b7b35
parent 1dec60f893aad9ae723caa67a78d1f22b3d91732
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