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

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