diff options
author | Alan Viverette <alanv@google.com> | 2015-10-12 19:41:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-12 19:41:10 +0000 |
commit | c83a6121d214631c0a52be5b2c5c8ce2f6470ed0 (patch) | |
tree | 03009bc3b006bb5d9477819da838fd44433b08c3 /services/core | |
parent | 6cc3735a492abd1c17f15a46287de70e62bf116d (diff) | |
parent | 3b493179770041aaa6bb9b0654e4cecd136fc937 (diff) | |
download | frameworks_base-c83a6121d214631c0a52be5b2c5c8ce2f6470ed0.zip frameworks_base-c83a6121d214631c0a52be5b2c5c8ce2f6470ed0.tar.gz frameworks_base-c83a6121d214631c0a52be5b2c5c8ce2f6470ed0.tar.bz2 |
Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
Diffstat (limited to 'services/core')
0 files changed, 0 insertions, 0 deletions