am 19ed73ae: am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread

* commit '19ed73ae7fddf66b335a89a33d346a5b50c1f274':
  Support for <compatible-screens><screen> in ADT.