OSDN Git Service

am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with...
authorAlan Viverette <alanv@google.com>
Mon, 12 Oct 2015 19:52:12 +0000 (19:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 19:52:12 +0000 (19:52 +0000)
commitff9532940084a89b4cfe89bc954e7d8af1c695f0
treeadbcf03e8d5448b1edbd7b795efbba57557da58d
parentff71f26fc5bbe58731d3d72853e8033ddaa31f2e
parentd9635e60f00ccd10187a6dd0c51243a201d55ab3
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