| commit | c83a6121d214631c0a52be5b2c5c8ce2f6470ed0 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Mon Oct 12 19:41:10 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 12 19:41:10 2015 +0000 |
| tree | 03009bc3b006bb5d9477819da838fd44433b08c3 | |
| parent | 6cc3735a492abd1c17f15a46287de70e62bf116d [diff] | |
| parent | 3b493179770041aaa6bb9b0654e4cecd136fc937 [diff] |
Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev