tree f66a2dda59e0d3a8bcbfc77496cbac637c2483d3
parent c30a1a17f988459a6388f5c558ec097a62f1e6cc
parent bcb5323316d898cc22873efc2a145a5912e8a75c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1512083729 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1512083729 +0000

[automerger] Implements proper handling of EdgeEffect for clipToPadding on NestedScrollView on API 21 and above. am: bcb5323316

Change-Id: I3dbfdf5db37d1d229335c2940b5be117b2d8d581