tree a0b08c174259d737c6eb16b385976dc38f6d968b
parent 51591b91a35f1227996121c2803990a62b328475
parent c83a6121d214631c0a52be5b2c5c8ce2f6470ed0
author Alan Viverette <alanv@google.com> 1444679191 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444679191 +0000

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