| commit | bbd8315daa82f9761c21d72ed22a3f001c28a6ca | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Tue Oct 13 00:19:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 00:19:30 2015 +0000 |
| tree | 6d3cbacd95873d8f52e0ac8469ab4db023f2823b | |
| parent | a7d5cc547dd277f10670998be6cafede3a9648e7 [diff] | |
| parent | ff9532940084a89b4cfe89bc954e7d8af1c695f0 [diff] |
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