commit 606fea5a24c877eb087e26ec4b9ff825df4717ff
author Xia Wang <xiaw@google.com> Mon Feb 11 15:21:03 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 11 15:21:03 2013 -0800
tree 25ab185762dfb8ceb8e458752afdd1e42c8e9e75
parent bda2992d209fb8607eaa5132211470b714428ec8
parent 54552bd85a572c6141d540b1a8374db8452388be

am 54552bd8: am 0bebaf39: Change uiautomation -> uiautomator

# Via Android Git Automerger (1) and Xia Wang (1)
* commit '54552bd85a572c6141d540b1a8374db8452388be':
  Change uiautomation -> uiautomator

uiautomator_test_libraries/src/com/android/uiautomator/common/helpers/AppHelperBase.java

diff --git a/uiautomator_test_libraries/src/com/android/uiautomator/common/helpers/AppHelperBase.java b/uiautomator_test_libraries/src/com/android/uiautomator/common/helpers/AppHelperBase.java
index 9bd474e..e3d9b61 100644
--- a/uiautomator_test_libraries/src/com/android/uiautomator/common/helpers/AppHelperBase.java
+++ b/uiautomator_test_libraries/src/com/android/uiautomator/common/helpers/AppHelperBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2013 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

uiautomator_test_libraries/src/com/android/uiautomator/platform/JankTestBase.java

diff --git a/uiautomator_test_libraries/src/com/android/uiautomator/platform/JankTestBase.java b/uiautomator_test_libraries/src/com/android/uiautomator/platform/JankTestBase.java
index 1e554bd..42e4db1 100644
--- a/uiautomator_test_libraries/src/com/android/uiautomator/platform/JankTestBase.java
+++ b/uiautomator_test_libraries/src/com/android/uiautomator/platform/JankTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2013 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.uiautomation.platform;
+package com.android.uiautomator.platform;
 
 import android.os.Bundle;
 import android.os.Environment;

uiautomator_test_libraries/src/com/android/uiautomator/platform/SurfaceFlingerHelper.java

diff --git a/uiautomator_test_libraries/src/com/android/uiautomator/platform/SurfaceFlingerHelper.java b/uiautomator_test_libraries/src/com/android/uiautomator/platform/SurfaceFlingerHelper.java
index f072d95..1fcdafd 100644
--- a/uiautomator_test_libraries/src/com/android/uiautomator/platform/SurfaceFlingerHelper.java
+++ b/uiautomator_test_libraries/src/com/android/uiautomator/platform/SurfaceFlingerHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2013 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.uiautomation.platform;
+package com.android.uiautomator.platform;
 
 import android.os.Environment;
 import android.util.Log;