summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-08-28 17:48:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-28 17:48:49 +0000
commitf76acc5ce3f322466afb6042c08a51cdaa80065e (patch)
tree41412aa701bbfaec56ea431c67565bf6ddf3a122 /libs
parent1bb69d0688f676584d2e1871c3a4a639c1401eb0 (diff)
parent1e1d8a5e159d2f1b5939ac0819089061a8b058d0 (diff)
downloadframeworks_base-f76acc5ce3f322466afb6042c08a51cdaa80065e.zip
frameworks_base-f76acc5ce3f322466afb6042c08a51cdaa80065e.tar.gz
frameworks_base-f76acc5ce3f322466afb6042c08a51cdaa80065e.tar.bz2
am 22ad4f00: am d4e0267a: am f29b2624: Merge "Fix log line" into lmp-dev
* commit '22ad4f00bf3a2e9aedf2c2a771b98a72f77df6f2': Fix log line
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/AnimationContext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/AnimationContext.cpp b/libs/hwui/AnimationContext.cpp
index 732f4f1..d7d9743 100644
--- a/libs/hwui/AnimationContext.cpp
+++ b/libs/hwui/AnimationContext.cpp
@@ -37,7 +37,7 @@ AnimationContext::~AnimationContext() {
AnimatorManager& animators = current->mRenderNode->animators();
animators.endAllAnimators();
LOG_ALWAYS_FATAL_IF(mCurrentFrameAnimations.mNextHandle == current,
- "Animate failed to remove from current frame list!");
+ "endAllAnimators failed to remove from current frame list!");
}
}