am 679ea79d: (-s ours) am de851166: DO NOT MERGE Remove useless...
am 679ea79d: (-s ours) am de851166: DO NOT MERGE Remove useless AnimationDrawable test, fix test for default one-shot
* commit '679ea79d':
DO NOT MERGE Remove useless AnimationDrawable test, fix test for default one-shot