summaryrefslogtreecommitdiffstats
path: root/core/java/android/animation
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2014-09-05 14:58:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-05 14:58:40 +0000
commitc237555c6cb89c347acf13eba45b875946473501 (patch)
tree9be9b068aea135c23d07be7500cd4b12280850c9 /core/java/android/animation
parent949bb79f70e088b29efb6d4af8ac7f3ae62c035e (diff)
parentda4bd209cffad7e47a4bc6e9f02c4bfc333d3d8d (diff)
downloadframeworks_base-c237555c6cb89c347acf13eba45b875946473501.zip
frameworks_base-c237555c6cb89c347acf13eba45b875946473501.tar.gz
frameworks_base-c237555c6cb89c347acf13eba45b875946473501.tar.bz2
Merge "Keep contact affinities separate across users." into lmp-dev
Diffstat (limited to 'core/java/android/animation')
0 files changed, 0 insertions, 0 deletions