tree 511d089282ba1e6432a41d5d04296ffbb3b40a8c
parent d12b7f790d8742541d126a2eaddca44b3fc4aad2
parent 391a7c381de0b61ea505d55d53e7977e6f361917
author Vu Thanh Cong <vuthanhcong.ict@gmail.com> 1532540110 -0700
committer android-build-merger <android-build-merger@google.com> 1532540110 -0700

Merge "Fix edge effect not showing up on first scroll" am: 894d8cf470
am: 391a7c381d

Change-Id: Icda44b95c21c99dc1de794f83bc28995a001c55a