tree e6ef58bb269e04d1076664a95338b4ca2ab69da2
parent 0d38d18a6cb3bc255ce16f17ebf2fdc8b491048b
parent ddf26e7bfeee44ae07242362d18bbf161dd84ea9
author Adam Cohen <adamcohen@google.com> 1336696975 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336696975 -0700

am ddf26e7b: Merge "Fixing widget overlapping another widget (issue 6475997)" into jb-dev

* commit 'ddf26e7bfeee44ae07242362d18bbf161dd84ea9':
  Fixing widget overlapping another widget (issue 6475997)