tree bc4ecd363fce00fea66961b5aabbdf58bb5de3f0
parent 49503107e97c4447e6de95d7fc85364f3bdd4186
parent e854180f4fce737ad2fdf2e73cc726b20d91a6ce
author Jim Miller <jaggies@google.com> 1273532141 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1273532141 -0700

Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo