OSDN Git Service

am 9bda7101: Fix the MergeRootFrameLayout rule by checking the presence of padding.
authorRomain Guy <romainguy@android.com>
Wed, 7 Oct 2009 19:42:20 +0000 (12:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2009 19:42:20 +0000 (12:42 -0700)
commit6e87d00a8bf001c9df144ed1e3de7261ee7b7dc0
tree20b5a27790ea6936a162a298d341a3ce014cc631
parent7bc7d2dc072c17d9aef5de3d5d465100187a994f
parent16385c975cab7e7283039e9226547b8c6d0144e1
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.