tree 5fc6f6752a6295d6b4003114a0c3b86d6bdbaa8c
parent d6f29cd8f92b098330818227428f5a42836097b7
parent 5520610cb2612054c5d0bcec9d031f7b71faa349
author Joe Onorato <joeo@google.com> 1306348986 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306348986 -0700

am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2

* commit '5520610cb2612054c5d0bcec9d031f7b71faa349':
  Make adb shell am display-size persistent.