tree 399fd39eee1d426dadf9b2ee27a5aa8ae60b9a75
parent 778aea3926b079fc055342c7b5de8f8f65d48206
parent 8af2a13d038002522c2f4e5d65bd703db9f86a08
author Fabrice Di Meglio <fdimeglio@google.com> 1348860978 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348860978 -0700

am 8af2a13d: Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev

* commit '8af2a13d038002522c2f4e5d65bd703db9f86a08':
  Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams