am bcbf5b1a: am 935dc32e: am 97d15c72: Merge "Fixing overlap pane offset when shortcut card disappears." into lmp-mr1-dev

* commit 'bcbf5b1ac1eb65fc679c5b6e9c28a1af0c71fc65':
  Fixing overlap pane offset when shortcut card disappears.
tree: 5e1aea3a7200954fbedd24487d193aa9dd2cb9e2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags