OSDN Git Service

am bbd8315d: am ff953294: am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag...
authorAlan Viverette <alanv@google.com>
Tue, 13 Oct 2015 01:59:02 +0000 (01:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Oct 2015 01:59:02 +0000 (01:59 +0000)
commit0cfe7638a361ea7f94730a6c06b992b8275d3612
tree29c60eee16d11255fdaaebf67e1dfe91e1972cb2
parent5247523c90f452689f2b0fea3e91da54b117c8b4
parentbbd8315daa82f9761c21d72ed22a3f001c28a6ca
am bbd8315d: am ff953294: am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev

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