| commit | 3b219bffe122b662dda57fc4750bc5f24364a88e | [log] [tgz] |
|---|---|---|
| author | Chet Haase <chet@google.com> | Thu Dec 05 22:44:46 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:44:46 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 2aa9f1f9c84b22bff7d481bd6fc3d82ce9d64d32 [diff] | |
| parent | a004f72cf00555aa2694b97ff6c17b97397cd471 [diff] |
am a004f72c: (-s ours) am 54276ad3: am cd89feb9: Merge "pause/resume for Animators" into klp-dev * commit 'a004f72cf00555aa2694b97ff6c17b97397cd471':