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

* commit '4c2db5f2a579132f6b6861c50d7ff99bb6c8035c':
  Fix missing @hide on ViewGroup.resolveLayoutParams()