OSDN Git Service

am ff953294: am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid colli...
authorAlan Viverette <alanv@google.com>
Tue, 13 Oct 2015 00:19:30 +0000 (00:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Oct 2015 00:19:30 +0000 (00:19 +0000)
commitbbd8315daa82f9761c21d72ed22a3f001c28a6ca
tree6d3cbacd95873d8f52e0ac8469ab4db023f2823b
parenta7d5cc547dd277f10670998be6cafede3a9648e7
parentff9532940084a89b4cfe89bc954e7d8af1c695f0
am ff953294: am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev

* commit 'ff9532940084a89b4cfe89bc954e7d8af1c695f0':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
core/java/android/view/View.java