tree 464987049132d7ccac6f867be796ae6f7d6a21d2
parent 417448369c170a34d76c477aa19c5293e3caa1df
parent 79411726d5a0eb0f439b90e2f262e0b983e55d9c
author Adam Powell <adamp@google.com> 1305650726 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305650726 -0700

am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2

* commit '79411726d5a0eb0f439b90e2f262e0b983e55d9c':
  Turn fading edges back on for ScrollView and HorizontalScrollView.