tree 74c91083b3ff85e9df529b4e9e96fc46fcd73e61
parent f4d9fc8e838dae4ec9c93ae10c7c151133280517
parent a9e4ad8ef3d22de321287992ba309e49a28f5582
author Patrick Dubroy <dubroy@google.com> 1306342694 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306342694 -0700

am a9e4ad8e: (-s ours) am 0544935b: am 1a009336: DO NOT MERGE Dynamically determine size of customize tray.

* commit 'a9e4ad8ef3d22de321287992ba309e49a28f5582':
  DO NOT MERGE Dynamically determine size of customize tray.