summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/scripts/new_merge.py
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-07-06 17:57:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-06 17:58:10 +0000
commit6d842f63a00e34edb583f9fdd6f233c20dcd00f2 (patch)
tree8c90327ca5669e37a1b704082ab43c5facd55641 /packages/Keyguard/scripts/new_merge.py
parent246d69849951e4dbc0726a7faa58ecb71f7cf460 (diff)
parent1f6c9a12149040f7980a45cc6a6518bbb1d6cc7c (diff)
downloadframeworks_base-6d842f63a00e34edb583f9fdd6f233c20dcd00f2.zip
frameworks_base-6d842f63a00e34edb583f9fdd6f233c20dcd00f2.tar.gz
frameworks_base-6d842f63a00e34edb583f9fdd6f233c20dcd00f2.tar.bz2
Merge "Fix DocumentsUI animation regression." into mnc-dev
Diffstat (limited to 'packages/Keyguard/scripts/new_merge.py')
0 files changed, 0 insertions, 0 deletions