am aa34ce49: am cf8da6b6: am 511ab64d: Fix 2215274 - Duplicate widgets appearing on top of each other

Merge commit 'aa34ce49c0b9ee8606c5bbb287dcd4ccf98faf74'

* commit 'aa34ce49c0b9ee8606c5bbb287dcd4ccf98faf74':
  Fix 2215274 - Duplicate widgets appearing on top of each other
tree: 94fb37a01ea7a21dbf6e87fcad4555b7da10c2fd
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE