tree 384bd709bfdad1b99e928efef531b47d16a3d8f3
parent e92dd5702bd2420cc52dece03e77130834c59566
parent c1a72346bb492a270b4c8d4f614836c6145951c2
author Xavier Ducrohet <xav@android.com> 1305766291 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305766291 -0700

am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1

* commit '582841e734bc85b247df64ac85b6ee09f7375f44':
  LayoutLib: support the new baseline/margin query API.