tree f80d3c223d42e245e83e176ae094c572b832982b
parent 45d0370b6cb9c71f68c1f3555bd835b8e9d92d71
parent 8ff8713e55227ee048a3d37ae8c32f2a2972136d
author Winson Chung <winsonc@google.com> 1317437377 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317437377 -0700

Merge "Workaround for stingray crash due to using old bitmaps. (Bug: 5397469)"