summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2012-02-17 19:26:39 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-02-17 19:26:39 -0800
commit4e753e08d146ecd1a45a4402bb6b2e392d890a33 (patch)
treec1582cf9921228dbe1ad29154f92a38554960af8 /cmds/bootanimation/BootAnimation.cpp
parente8585b1721b84798c4e7413939fd085f7a39bc0e (diff)
parentb13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4 (diff)
Merge "frameworks/base refactoring."
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
-rw-r--r--cmds/bootanimation/BootAnimation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 0d5b4caa91b4..3545ace49179 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -25,12 +25,12 @@
#include <cutils/properties.h>
+#include <androidfw/AssetManager.h>
#include <binder/IPCThreadState.h>
-#include <utils/threads.h>
#include <utils/Atomic.h>
#include <utils/Errors.h>
#include <utils/Log.h>
-#include <utils/AssetManager.h>
+#include <utils/threads.h>
#include <ui/PixelFormat.h>
#include <ui/Rect.h>