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)
* commit '842725fc642b7ba2c087cc81796973b838c23c76':
  Bring in more layout lib changes from hc-mr1.


Trivial merge