summaryrefslogtreecommitdiffstats
path: root/core/res/res/anim
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-06-02 22:10:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-02 22:10:31 +0000
commit47297e8f82118555cae7afb1bf4c713a26a98a22 (patch)
tree2c114d64553217906a6c5a563d9a195ba01efa46 /core/res/res/anim
parent8d2a604ce4fc7666399e21f2ab9c1cdb98c5563a (diff)
parent4ec00382431d59a20fde706c27aa04c624e64249 (diff)
downloadframeworks_base-47297e8f82118555cae7afb1bf4c713a26a98a22.zip
frameworks_base-47297e8f82118555cae7afb1bf4c713a26a98a22.tar.gz
frameworks_base-47297e8f82118555cae7afb1bf4c713a26a98a22.tar.bz2
am 8dead81f: Merge "Code cleaning" into lmp-preview-dev
* commit '8dead81f3b1548d0d3f84a585b389baf8d415e99': Code cleaning
Diffstat (limited to 'core/res/res/anim')
-rw-r--r--core/res/res/anim/voice_activity_open_enter.xml1
-rw-r--r--core/res/res/anim/voice_layer_enter.xml1
2 files changed, 0 insertions, 2 deletions
diff --git a/core/res/res/anim/voice_activity_open_enter.xml b/core/res/res/anim/voice_activity_open_enter.xml
index 57fba2a..ce7a4f9 100644
--- a/core/res/res/anim/voice_activity_open_enter.xml
+++ b/core/res/res/anim/voice_activity_open_enter.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/* //device/apps/common/res/anim/fade_in.xml
**
** Copyright 2007, The Android Open Source Project
**
diff --git a/core/res/res/anim/voice_layer_enter.xml b/core/res/res/anim/voice_layer_enter.xml
index 57fba2a..ce7a4f9 100644
--- a/core/res/res/anim/voice_layer_enter.xml
+++ b/core/res/res/anim/voice_layer_enter.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/* //device/apps/common/res/anim/fade_in.xml
**
** Copyright 2007, The Android Open Source Project
**