| commit | d9635e60f00ccd10187a6dd0c51243a201d55ab3 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Mon Oct 12 19:46:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 19:46:31 2015 +0000 |
| tree | a0b08c174259d737c6eb16b385976dc38f6d968b | |
| parent | 51591b91a35f1227996121c2803990a62b328475 [diff] | |
| parent | c83a6121d214631c0a52be5b2c5c8ce2f6470ed0 [diff] |
am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev * commit 'c83a6121d214631c0a52be5b2c5c8ce2f6470ed0': Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR