]> git.saurik.com Git - android/aapt.git/commitdiff
am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
authorDianne Hackborn <hackbod@google.com>
Mon, 23 May 2011 23:16:54 +0000 (16:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 May 2011 23:16:54 +0000 (16:16 -0700)
* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9':
  Add "television" mode.


Trivial merge