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