Commits
Fabrice Di Meglio authored and Android Git Automerger committed cd94777f460M
am afb856f2: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev * commit 'afb856f2aa7590a191cb676acbee4141ddd21d6b':
Showing diff to57cfcfc8aba