am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev

* commit '5b04d0320b877693fe10f70773657585c1c4aa58':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)