OSDN Git Service

am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from...
authorXavier Ducrohet <xav@android.com>
Wed, 29 Jun 2011 02:14:05 +0000 (19:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jun 2011 02:14:05 +0000 (19:14 -0700)
commit0889d3a6515062fcfc258e2ac2bda67bfb5cc120
treefcf60e712c8ec063d65d20af892cd7fd3e822c75
parentb05d71e51cf06427d0ebf54435975b42fc9d4762
parentbbfaea55ec4913499661bf653a9669b4b3be95c0
am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread

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