| commit | 499c21378a5da60fa66ae75fec7f650575ceef10 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Sep 28 22:09:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 28 22:09:54 2015 +0000 |
| tree | 1b429b028adc60247f91deac0a11f5d2b765c4c2 | |
| parent | 582b2fd89ca673978987d57dd969732a5295c74b [diff] | |
| parent | 2e72fa25b322f9e6fa0e8be84c83c0a689a88ed6 [diff] |
am 2e72fa25: Merge "fix for AutomationTest.testWindowAnimationFrameStats" into lollipop-mr1-cts-dev * commit '2e72fa25b322f9e6fa0e8be84c83c0a689a88ed6': fix for AutomationTest.testWindowAnimationFrameStats