tree af3918b9314ff41e0cfb4ab9d979aea90de8aa8d
parent 95e61e231efd7315f392e97d39ade5e1de2c43e1
parent acdcfbc953a3aa382d0e8a9769eccfcfb96b8382
author Dianne Hackborn <hackbod@google.com> 1315863722 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315863722 -0700

Merge "Get rid of some animation flickers and other bad things."