OSDN Git Service

am ca69cda6: am 9bda7101: Fix the MergeRootFrameLayout rule by checking the presence...
authorRomain Guy <romainguy@android.com>
Mon, 12 Oct 2009 19:33:32 +0000 (12:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2009 19:33:32 +0000 (12:33 -0700)
commit7b519c52d5f50c9c38ff34a80a9a328616154ea6
tree1c9150bc6811957cf0e985dcfbb925034277d474
parente43e87a948cdd852ba61c54a0f23b485ce07a8c8
parent6e87d00a8bf001c9df144ed1e3de7261ee7b7dc0
am ca69cda6: am 9bda7101: Fix the MergeRootFrameLayout rule by checking the presence of padding.

Merge commit 'ca69cda6f8c4c098dbd178929322d53646215339'

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