tree 6fb205a733931a18b7a55cc3ef341c19b33e7496
parent a571674a93c62f432c9b266d814650b0264fc444
parent 0889d3a6515062fcfc258e2ac2bda67bfb5cc120
author Xavier Ducrohet <xav@android.com> 1309313732 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309313732 -0700

am e1918353: am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread

* commit 'e1918353e795d4f4fb67760ad593458517976072':
  Bring in more layout lib changes from hc-mr1.