tree 2de34eaf949bd30904e7e7343a64fce86fec4561
parent 6043f9643771264ff6832b7367f60c50f1658952
parent a79113be346ea0d64974b3c6ac84dfe823b96c63
author Xavier Ducrohet <xav@android.com> 1298597047 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298597047 -0800

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

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