tree bc0b27fddf38350beadb2f2bf2c9cfbe1509b9ce
parent 319e4728609f3885a17e0ab579c6a678157a0e8c
parent a5945eea2eb65681b931afe734a112ee4fbfefee
author Daniel Xie <dxie@google.com> 1433783472 +0000
committer android-build-merger <android-build-merger@google.com> 1433783472 +0000

Merge "fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL" into lollipop-cts-dev
automerge: a5945ee

* commit 'a5945eea2eb65681b931afe734a112ee4fbfefee':
  fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL