tree 60ddaf1c2c9936d4711c93a82705cdd325e1fa53
parent c8307c885f8462f2baf9f06c9916d1521f7fdcfb
parent abc838716816107754ab0479242d03807ce79fc2
author Xavier Ducrohet <xav@android.com> 1307492231 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307492231 -0700

am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2

* commit 'abc838716816107754ab0479242d03807ce79fc2':
  Import the Layoutlib from hc-mr1.