am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev

* commit '8de328c996a9f3a8f5ca3ea8e7c47421dd09b9aa':
  Fix missing @hide on ViewGroup.resolveLayoutParams()