tree 0c05db31782446a4d3b3864a45d61db0c514cc50
parent c85467672fe53721222828b458716f9f9303808d
parent 9bda7101b8c7007e65f0a744d93e4e446086f3ec
author Romain Guy <romainguy@android.com> 1254944540 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254944540 -0700

am 9bda7101: Fix the MergeRootFrameLayout rule by checking the presence of padding.

Merge commit '9bda7101b8c7007e65f0a744d93e4e446086f3ec' into eclair-mr2

* commit '9bda7101b8c7007e65f0a744d93e4e446086f3ec':
  Fix the MergeRootFrameLayout rule by checking the presence of padding.