am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev

* commit '08f27b1bffbf01d9e5a102b8c90a3c2095fc82b3':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
This commit is contained in:
Fabrice Di Meglio
2012-10-19 19:19:00 -07:00
committed by Android Git Automerger

View File

@@ -5990,11 +5990,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
*/
@Override
public void resolveLayoutDirection(int layoutDirection) {
// No need to resolve if it is the same layout direction as before
if (this.layoutDirection == layoutDirection) {
return;
}
setLayoutDirection(layoutDirection);
if (!isMarginRelative()) return;