am b84c678a: (-s ours) am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread

* commit 'b84c678a9c397d5b3c5141ddda304ceb71426c8d':
  LayoutLib: Adapt the HC layoutlib to GB. do not merge.