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

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