tree 5d72c3e22cf0a911865ef7e827750f688c37ec92
parent f0b7ff155c1ef70a236631c15aaf21c16b7e4815
parent a1c7b2951fc3f5024c8d20f0ac00f26cd8e48245
author Adam Powell <adamp@google.com> 1422652780 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422652780 +0000

am a1c7b295: am 57d28dab: Add sample for nested scrolling

* commit 'a1c7b2951fc3f5024c8d20f0ac00f26cd8e48245':
  Add sample for nested scrolling